diff --git a/script/confirm.bash b/script/confirm.bash index 068be42a..48510156 100644 --- a/script/confirm.bash +++ b/script/confirm.bash @@ -1,8 +1,9 @@ #!/usr/bin/env bash echo "XXX confirm.bash: $1" +echo "XXX stdin=$(readlink -f /dev/stdin; ls -l $(readlink -f /dev/stdin))" set -x # if AUTOCONFIRM environment variable set, auto-confirm -if [[ "$AUTOCONFIRM" ]] ; then exit 0 ; fi +#if [[ "$AUTOCONFIRM" ]] ; then exit 0 ; fi if [[ -z "$DEFAULT" ]] ; then DEFAULT=0 ; fi if [[ "$DEFAULT" = "0" ]] ; then @@ -10,7 +11,7 @@ if [[ "$DEFAULT" = "0" ]] ; then else read -p "$1 [y/N]? " -n 1 -r fi -echo "XXX read returned $?; REPLY=${REPLY@Q}; stdin=$(readlink -f /dev/stdin; ls -l $(readlink -f /dev/stdin))" +echo "XXX read returned $?; REPLY=${REPLY@Q}" if [[ -n "$REPLY" ]] ; then echo ; fi if [[ -n "$REPLY" ]] ; then # not empty diff --git a/script/install.bash b/script/install.bash index e2b395f6..5fb58fde 100755 --- a/script/install.bash +++ b/script/install.bash @@ -32,12 +32,12 @@ bash script/install/ruby.bash || exit 1 # check ruby version bash script/install/postgresql.bash || exit 1 # create user & db if it doesn't exist +echo "EXIT EARLY"; exit 1 + bash script/install/imagemagick.bash || exit 1 # install imagemagick sudo apt-get install wkhtmltopdf xvfb || exit 1 -echo "EXIT EARLY"; exit 1 - bash script/install/nztrain.bash || exit 1 # fix files & directory structure bash script/install/bundler.bash || exit 1