From f0d81e2d33b0bab39c52079477c6bafcc63c1e21 Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Mon, 9 Feb 2015 16:56:08 -0800 Subject: [PATCH] Revert "install: adding some debugging output" This reverts commit c8efe3d28ab862441f7f40e2683b1a91688aabc4. Conflicts: install.sh --- .travis.yml | 2 +- install.sh | 33 ++------------ test/install_script/nvm_check_global_modules | 45 +++----------------- 3 files changed, 10 insertions(+), 70 deletions(-) diff --git a/.travis.yml b/.travis.yml index b396ea9..762181b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ install: - chmod +x /tmp/urchin/package/urchin - '[ -z "$WITHOUT_CURL" ] || sudo apt-get remove curl -y' script: - - DEBUG='nvm:*' NVM_DIR=$TRAVIS_BUILD_DIR make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin/package/urchin test-$SHELL + - NVM_DIR=$TRAVIS_BUILD_DIR make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin/package/urchin test-$SHELL env: - SHELL=sh TEST_SUITE=install_script - SHELL=dash TEST_SUITE=install_script diff --git a/install.sh b/install.sh index 3b3590b..f1b3254 100755 --- a/install.sh +++ b/install.sh @@ -1,16 +1,7 @@ #!/bin/bash + set -e -puts() (IFS=" "; printf %s\\n "$*" ;) -error() (IFS=" "; printf %s\\n "$*" >&2 ;) -debug() (IFS=" "; printf %s\\n ".. $*" >&2 ;) - -if [ "$DEBUG" = 'nvm:*' ] || [ "$DEBUG" = 'nvm:install' ]; then - NVM_DEBUG=0 - debug 'Script debugging enabled (in: `install.sh`).' -fi - - nvm_has() { type "$1" > /dev/null 2>&1 } @@ -51,9 +42,7 @@ nvm_source() { nvm_download() { if nvm_has "curl"; then - [ "$NVM_DEBUG" = 0 ] && set +x curl $* - [ "$NVM_DEBUG" = 0 ] && set -x elif nvm_has "wget"; then # Emulate curl with wget ARGS=$(echo "$*" | command sed -e 's/--progress-bar /--progress=bar /' \ @@ -62,9 +51,7 @@ nvm_download() { -e 's/-s /-q /' \ -e 's/-o /-O /' \ -e 's/-C - /-c /') - [ "$NVM_DEBUG" = 0 ] && set +x wget $ARGS - [ "$NVM_DEBUG" = 0 ] && set +x fi } @@ -79,18 +66,10 @@ install_nvm_from_git() { # Cloning to $NVM_DIR echo "=> Downloading nvm from git to '$NVM_DIR'" printf "\r=> " - [ "$NVM_DEBUG" = 0 ] && set +x mkdir -p "$NVM_DIR" command git clone "$(nvm_source git)" "$NVM_DIR" - [ "$NVM_DEBUG" = 0 ] && set -x fi - - [ "$NVM_DEBUG" = 0 ] && set +x - cd "$NVM_DIR" || return $? - command git checkout --quiet $(nvm_latest_version) || return $? - command git branch --quiet -D master >/dev/null 2>&1 || return $? - [ "$NVM_DEBUG" = 0 ] && set +x - + cd "$NVM_DIR" && command git checkout --quiet $(nvm_latest_version) && command git branch --quiet -D master >/dev/null 2>&1 return } @@ -151,7 +130,6 @@ nvm_check_global_modules() { local NPM_VERSION NPM_VERSION="$(npm --version)" NPM_VERSION="${NPM_VERSION:--1}" - [ "$NVM_DEBUG" = 0 ] && debug "NPM detected (at version ${NPM_VERSION}.)" [ "${NPM_VERSION%%[!-0-9]*}" -gt 0 ] || return 0 local NPM_GLOBAL_MODULES @@ -167,9 +145,6 @@ nvm_check_global_modules() { sed -ne '1!p' | # Remove the first line wc -l | tr -d ' ' # Count entries )" - [ "$NVM_DEBUG" = 0 ] && { - debug "(${MODULE_COUNT}) global modules detected:" - error "$NPM_GLOBAL_MODULES" ;} if [ $MODULE_COUNT -ne 0 ]; then cat <<-'END_MESSAGE' @@ -252,11 +227,9 @@ nvm_do_install() { # during the execution of the install script # nvm_reset() { - unset -f puts error debug \ - nvm_reset nvm_has nvm_latest_version \ + unset -f nvm_reset nvm_has nvm_latest_version \ nvm_source nvm_download install_nvm_as_script install_nvm_from_git \ nvm_detect_profile nvm_check_global_modules nvm_do_install - unset NPM_DEBUG } [ "_$NVM_ENV" = "_testing" ] || nvm_do_install diff --git a/test/install_script/nvm_check_global_modules b/test/install_script/nvm_check_global_modules index 0c6889a..c57d672 100755 --- a/test/install_script/nvm_check_global_modules +++ b/test/install_script/nvm_check_global_modules @@ -1,5 +1,4 @@ #!/bin/sh -puts() (IFS=" "; printf %s\\n "$*" ;) cleanup () { rm -rf "$npm_config_prefix/lib" >/dev/null 2>&1 @@ -11,8 +10,7 @@ cleanup () { unset -f setup cleanup die unset message ORIGINAL_PATH } - -die () { puts "!! $@" ; cleanup ; exit 1; } +die () { echo $@ ; cleanup ; exit 1; } NVM_ENV=testing . ../../install.sh @@ -24,32 +22,16 @@ setup () { mkdir -p "$npm_config_prefix/lib" } -setup +setup npm install -g nop >/dev/null || die 'nvm_check_global_modules cannot be tested because `npm` cannot install the `nop` package' message=$(nvm_check_global_modules) -[ ! -z "$message" ] || { - puts '-- `npm --version`: '"$(npm --version)" - puts '-- `npm list -g`:' - npm list -g --depth=0 - puts '-- Printed message:' - puts "'''$message'''" - - die "nvm_check_global_modules should have printed a notice when npm had global modules installed" ;} - +[ ! -z "$message" ] || die "nvm_check_global_modules should have printed a notice when npm had global modules installed" npm uninstall -g nop >/dev/null message=$(nvm_check_global_modules) -[ -z "$message" ] || { - puts '-- `npm --version`: '"$(npm --version)" - puts '-- `npm list -g`:' - npm list -g --depth=0 - puts '-- Printed message:' - puts "'''$message'''" - - die "nvm_check_global_modules should not have printed a notice when npm had no global modules installed" ;} - +[ -z "$message" ] || die "nvm_check_global_modules should not have printed a notice when npm had no global modules installed" # Faking an installation of npm mkdir -p "$npm_config_prefix/lib/node_modules/npm" @@ -58,16 +40,7 @@ cat <<'JSON' >"$npm_config_prefix/lib/node_modules/npm/package.json" JSON message=$(nvm_check_global_modules) -[ -z "$message" ] || { - puts '-- `which npm`: ' "$(which npm)" - puts '-- `npm --version`: ' "$(npm --version)" - puts '-- `npm list -g`:' - npm list -g --depth=0 - puts '-- Printed message:' - puts "'''$message'''" - - die "nvm_check_global_modules should not have printed a notice when npm had only itself installed as a global module" ;} - +[ -z "$message" ] || die "nvm_check_global_modules should have not printed a notice when npm had only itself installed as a global module" # Faking the absence of npm PATH=".:$PATH" @@ -75,13 +48,7 @@ touch npm chmod +x npm message=$(nvm_check_global_modules) -[ -z "$message" ] || { - puts '-- `which npm`: ' "$(which npm)" - puts '-- `npm --version`: ' "$(npm --version)" - puts '-- Printed message:' - puts "'''$message'''" - - die "nvm_check_global_modules should not have printed a notice when npm was unavailable" ;} +[ -z "$message" ] || die "nvm_check_global_modules should have not printed a notice when npm was unavailable" cleanup