[commit: packages/Cabal] ghc-head: Rename SSH-USER to SSH_USER for consistency (bc48221)

git at git.haskell.org git at git.haskell.org
Wed Oct 16 06:33:15 UTC 2013


Repository : ssh://git@git.haskell.org/Cabal

On branch  : ghc-head
Link       : http://git.haskell.org/packages/Cabal.git/commitdiff/bc48221507acdb94b1f74cd66e1b1e1eed628ae4

>---------------------------------------------------------------

commit bc48221507acdb94b1f74cd66e1b1e1eed628ae4
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Tue Oct 15 09:07:41 2013 -0700

    Rename SSH-USER to SSH_USER for consistency
    
    (cherry picked from commit 33bb790fedbe9ad4aca693b4906fb21b054dffba)


>---------------------------------------------------------------

bc48221507acdb94b1f74cd66e1b1e1eed628ae4
 Cabal/Makefile |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cabal/Makefile b/Cabal/Makefile
index fa1cfc3..ab2c0cf 100644
--- a/Cabal/Makefile
+++ b/Cabal/Makefile
@@ -8,7 +8,7 @@ KIND=rc
 PREFIX=/usr/local
 HC=ghc
 GHCFLAGS=-Wall
-SSH-USER=$USER
+SSH_USER=$USER
 
 all: build
 
@@ -124,8 +124,8 @@ $(DIST_STAMP) : $(HADDOCK_STAMP) $(USERGUIDE_STAMP) $(SDIST_STAMP)
 	@echo "Release fileset prepared: $(DISTLOC)/"
 
 release: $(DIST_STAMP)
-	scp -r $(DISTLOC) $(SSH-USER)@haskell.org:/srv/web/haskell.org/cabal/release/cabal-$(VERSION)
-	ssh $(SSH-USER)@haskell.org 'cd /srv/web/haskell.org/cabal/release && rm -f $(KIND) && ln -s cabal-$(VERSION) $(KIND)'
+	scp -r $(DISTLOC) $(SSH_USER)@haskell.org:/srv/web/haskell.org/cabal/release/cabal-$(VERSION)
+	ssh $(SSH_USER)@haskell.org 'cd /srv/web/haskell.org/cabal/release && rm -f $(KIND) && ln -s cabal-$(VERSION) $(KIND)'
 
 # tags...
 



More information about the ghc-commits mailing list