Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/423019e34745f5b0eb7855acf038afc40e9653e2 >--------------------------------------------------------------- commit 423019e34745f5b0eb7855acf038afc40e9653e2 Author: Duncan Coutts <[email protected]> Date: Sun Feb 27 16:57:13 2011 +0000 Minor tweaks to bootstrap script When using curl, fail better on HTTP errors. Also remove some dead code. >--------------------------------------------------------------- cabal-install/bootstrap.sh | 21 ++------------------- 1 files changed, 2 insertions(+), 19 deletions(-) diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh index 81821cb..e7722b8 100644 --- a/cabal-install/bootstrap.sh +++ b/cabal-install/bootstrap.sh @@ -38,7 +38,7 @@ do echo echo "options:" echo " --user Install for the local user (default)" - echo " --global Install systemwide" + echo " --global Install systemwide (must be run as root)" exit;; esac done @@ -107,23 +107,6 @@ info_pkg () { fi } -dep_pkg () { - PKG=$1 - VER_MATCH=$2 - if need_pkg ${PKG} ${VER_MATCH} - then - echo - echo "The Haskell package '${PKG}' is required but it is not installed." - echo "If you are using a ghc package provided by your operating system" - echo "then install the corresponding packages for 'parsec' and 'network'." - echo "If you built ghc from source with only the core libraries then you" - echo "should install these extra packages. You can get them from hackage." - die "The Haskell package '${PKG}' is required but it is not installed." - else - echo "${PKG} is already installed and the version is ok." - fi -} - fetch_pkg () { PKG=$1 VER=$2 @@ -131,7 +114,7 @@ fetch_pkg () { URL=${HACKAGE_URL}/${PKG}/${VER}/${PKG}-${VER}.tar.gz if which ${CURL} > /dev/null then - ${CURL} -C - -O ${URL} || die "Failed to download ${PKG}." + ${CURL} --fail -C - -O ${URL} || die "Failed to download ${PKG}." elif which ${WGET} > /dev/null then ${WGET} -c ${URL} || die "Failed to download ${PKG}." _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
