install: adding some debugging output

master
elliottcable 2015-02-07 20:50:10 -06:00
parent 0717d5f995
commit c8efe3d28a
3 changed files with 71 additions and 11 deletions

View File

@ -5,7 +5,7 @@ install:
- chmod +x /tmp/urchin/package/urchin - chmod +x /tmp/urchin/package/urchin
- '[ -z "$WITHOUT_CURL" ] || sudo apt-get remove curl -y' - '[ -z "$WITHOUT_CURL" ] || sudo apt-get remove curl -y'
script: script:
- NVM_DIR=$TRAVIS_BUILD_DIR make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin/package/urchin test-$SHELL - DEBUG='nvm:*' NVM_DIR=$TRAVIS_BUILD_DIR make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin/package/urchin test-$SHELL
env: env:
- SHELL=sh TEST_SUITE=install_script - SHELL=sh TEST_SUITE=install_script
- SHELL=dash TEST_SUITE=install_script - SHELL=dash TEST_SUITE=install_script

View File

@ -1,7 +1,16 @@
#!/bin/bash #!/bin/bash
set -e 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() { nvm_has() {
type "$1" > /dev/null 2>&1 type "$1" > /dev/null 2>&1
} }
@ -42,7 +51,9 @@ nvm_source() {
nvm_download() { nvm_download() {
if nvm_has "curl"; then if nvm_has "curl"; then
[ "$NVM_DEBUG" = 0 ] && set +x
curl $* curl $*
[ "$NVM_DEBUG" = 0 ] && set -x
elif nvm_has "wget"; then elif nvm_has "wget"; then
# Emulate curl with wget # Emulate curl with wget
ARGS=$(echo "$*" | command sed -e 's/--progress-bar /--progress=bar /' \ ARGS=$(echo "$*" | command sed -e 's/--progress-bar /--progress=bar /' \
@ -51,7 +62,9 @@ nvm_download() {
-e 's/-s /-q /' \ -e 's/-s /-q /' \
-e 's/-o /-O /' \ -e 's/-o /-O /' \
-e 's/-C - /-c /') -e 's/-C - /-c /')
[ "$NVM_DEBUG" = 0 ] && set +x
wget $ARGS wget $ARGS
[ "$NVM_DEBUG" = 0 ] && set +x
fi fi
} }
@ -66,10 +79,18 @@ install_nvm_from_git() {
# Cloning to $NVM_DIR # Cloning to $NVM_DIR
echo "=> Downloading nvm from git to '$NVM_DIR'" echo "=> Downloading nvm from git to '$NVM_DIR'"
printf "\r=> " printf "\r=> "
[ "$NVM_DEBUG" = 0 ] && set +x
mkdir -p "$NVM_DIR" mkdir -p "$NVM_DIR"
command git clone "$(nvm_source git)" "$NVM_DIR" command git clone "$(nvm_source git)" "$NVM_DIR"
[ "$NVM_DEBUG" = 0 ] && set -x
fi fi
cd "$NVM_DIR" && command git checkout --quiet $(nvm_latest_version) && command git branch --quiet -D master >/dev/null 2>&1
[ "$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
return return
} }
@ -130,6 +151,7 @@ nvm_check_global_modules() {
local NPM_VERSION local NPM_VERSION
NPM_VERSION="$(npm --version)" NPM_VERSION="$(npm --version)"
NPM_VERSION="${NPM_VERSION:-0}" NPM_VERSION="${NPM_VERSION:-0}"
[ "$NVM_DEBUG" = 0 ] && debug "NPM detected (at version ${NPM_VERSION}.)"
[ "${NPM_VERSION%%[!0-9]*}" -gt 1 ] || return 0 [ "${NPM_VERSION%%[!0-9]*}" -gt 1 ] || return 0
local NPM_GLOBAL_MODULES local NPM_GLOBAL_MODULES
@ -141,6 +163,9 @@ nvm_check_global_modules() {
sed -ne '1!p' | # Remove the first line sed -ne '1!p' | # Remove the first line
wc -l | tr -d ' ' # Count entries 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 if [ $MODULE_COUNT -ne 0 ]; then
cat <<-'END_MESSAGE' cat <<-'END_MESSAGE'
@ -223,9 +248,11 @@ nvm_do_install() {
# during the execution of the install script # during the execution of the install script
# #
nvm_reset() { nvm_reset() {
unset -f nvm_reset nvm_has nvm_latest_version \ unset -f puts error debug \
nvm_reset nvm_has nvm_latest_version \
nvm_source nvm_download install_nvm_as_script install_nvm_from_git \ nvm_source nvm_download install_nvm_as_script install_nvm_from_git \
nvm_detect_profile nvm_check_global_modules nvm_do_install nvm_detect_profile nvm_check_global_modules nvm_do_install
unset NPM_DEBUG
} }
[ "_$NVM_ENV" = "_testing" ] || nvm_do_install [ "_$NVM_ENV" = "_testing" ] || nvm_do_install

View File

@ -1,4 +1,5 @@
#!/bin/sh #!/bin/sh
puts() (IFS=" "; printf %s\\n "$*" ;)
cleanup () { cleanup () {
rm -rf "$npm_config_prefix/lib" >/dev/null 2>&1 rm -rf "$npm_config_prefix/lib" >/dev/null 2>&1
@ -7,10 +8,11 @@ cleanup () {
rm -f npm rm -f npm
PATH="$ORIGINAL_PATH" PATH="$ORIGINAL_PATH"
unset -f setup cleanup die skip unset -f setup cleanup die
unset message ORIGINAL_PATH unset message ORIGINAL_PATH
} }
die () { echo $@ ; cleanup ; exit 1; }
die () { puts "!! $@" ; cleanup ; exit 1; }
NVM_ENV=testing . ../../install.sh NVM_ENV=testing . ../../install.sh
@ -22,16 +24,32 @@ setup () {
mkdir -p "$npm_config_prefix/lib" mkdir -p "$npm_config_prefix/lib"
} }
setup setup
npm install -g nop >/dev/null npm install -g nop >/dev/null
message=$(nvm_check_global_modules) message=$(nvm_check_global_modules)
[ ! -z "$message" ] || die "nvm_check_global_modules should have printed a notice when npm had global modules installed" [ ! -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" ;}
npm uninstall -g nop >/dev/null npm uninstall -g nop >/dev/null
message=$(nvm_check_global_modules) message=$(nvm_check_global_modules)
[ -z "$message" ] || die "nvm_check_global_modules should not have printed a notice when npm had no global modules installed" [ -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" ;}
# Faking an installation of npm # Faking an installation of npm
mkdir -p "$npm_config_prefix/lib/node_modules/npm" mkdir -p "$npm_config_prefix/lib/node_modules/npm"
@ -40,7 +58,16 @@ cat <<'JSON' >"$npm_config_prefix/lib/node_modules/npm/package.json"
JSON JSON
message=$(nvm_check_global_modules) message=$(nvm_check_global_modules)
[ -z "$message" ] || die "nvm_check_global_modules should have not printed a notice when npm had only itself installed as a global module" [ -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" ;}
# Faking the absence of npm # Faking the absence of npm
PATH=".:$PATH" PATH=".:$PATH"
@ -48,7 +75,13 @@ touch npm
chmod +x npm chmod +x npm
message=$(nvm_check_global_modules) message=$(nvm_check_global_modules)
[ -z "$message" ] || die "nvm_check_global_modules should have not printed a notice when npm was unavailable" [ -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" ;}
cleanup cleanup