From 8f57b7c38b6fec912236160b268aa8ba3291f60f Mon Sep 17 00:00:00 2001 From: mj Date: Tue, 27 Oct 2015 00:52:56 +0100 Subject: [PATCH] [FIX] install.sh: DON'T ALWAYS INSTALL: if [ ! -n "$DONTINSTALL" ]; then DONTINSTALL="1" fi --- tools/install.sh | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/tools/install.sh b/tools/install.sh index 0bbb693..3f5d461 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -12,18 +12,24 @@ set -e -if [ -d /proc/vz ] && [ ! -d /proc/vz/beancounter ] && [ ! $DONTINSTALL ]; then - apt-get -yq install curl dialog git nano screen zsh -else - if [ "$UID" != 0 ]; then CMD_PREFIX="sudo"; else CMD_PREFIX=""; fi +if [ ! -n "$DONTINSTALL" ]; then + DONTINSTALL="1" +fi + +if [ ! $DONTINSTALL ]; then + if [ -d /proc/vz ] && [ ! -d /proc/vz/beancounter ]; then + apt-get -yq install curl dialog git nano screen zsh + else + if [ "$UID" != 0 ]; then CMD_PREFIX="sudo"; else CMD_PREFIX=""; fi - if [ "$SHELL" != "$(which zsh)" ]; then - echo "$(which zsh)" - $CMD_PREFIX echo "enter pass...." + if [ "$SHELL" != "$(which zsh)" ]; then + echo "$(which zsh)" + $CMD_PREFIX echo "enter pass...." - echo "ok" + echo "ok" - $CMD_PREFIX apt-get -yq install curl dialog git nano zsh + $CMD_PREFIX apt-get -yq install curl dialog git nano zsh + fi fi fi -- 2.0.0