[commit: Cabal] master: small improvements to bootstrap (e9b9aff)
Ian Lynagh
igloo at earth.li
Fri Jun 24 01:59:24 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/e9b9afff07ebe103d16164114b4b8292de7ed109
>---------------------------------------------------------------
commit e9b9afff07ebe103d16164114b4b8292de7ed109
Author: Duncan Coutts <duncan at haskell.org>
Date: Fri Sep 26 21:48:28 2008 +0000
small improvements to bootstrap
patch sent in by brian0, ticket #357
>---------------------------------------------------------------
cabal-install/bootstrap.sh | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh
index bc94329..3348d41 100644
--- a/cabal-install/bootstrap.sh
+++ b/cabal-install/bootstrap.sh
@@ -20,10 +20,10 @@ case `which wget curl` in
curl -O ${CABAL_URL} -O ${HTTP_URL} -O ${ZLIB_URL}
;;
*wget)
- wget ${CABAL_URL} ${HTTP_URL} ${ZLIB_URL}
+ wget -c ${CABAL_URL} ${HTTP_URL} ${ZLIB_URL}
;;
*)
- echo "Failed to find a downloader, 'wget' or 'curl' is required" >&2
+ echo "Failed to find a downloader. 'wget' or 'curl' is required." >&2
exit 2
;;
esac
@@ -46,6 +46,15 @@ cd ..
runghc Setup configure --user && runghc Setup build && runghc Setup install
+CABAL_BIN="$HOME/.cabal/bin"
+echo
+
+if [ -x "$CABAL_BIN/cabal" ]
+then
+ echo "cabal successfully installed in $CABAL_BIN."
+ echo "You may want to add $CABAL_BIN to your PATH."
+else
+ echo "Sorry, something went wrong."
+fi
+
echo
-echo "If all went well then 'cabal' is in $HOME/.cabal/bin/"
-echo "You may want to add this dir to your PATH"
More information about the Cvs-libraries
mailing list