Commit 8f57b7c38b6fec912236160b268aa8ba3291f60f
1 parent
80d0010466
Exists in
master
and in
1 other branch
[FIX] install.sh: DON'T ALWAYS INSTALL:
if [ ! -n "$DONTINSTALL" ]; then DONTINSTALL="1" fi
Showing 1 changed file with 15 additions and 9 deletions Side-by-side Diff
tools/install.sh
| ... | ... | @@ -12,18 +12,24 @@ |
| 12 | 12 | |
| 13 | 13 | set -e |
| 14 | 14 | |
| 15 | -if [ -d /proc/vz ] && [ ! -d /proc/vz/beancounter ] && [ ! $DONTINSTALL ]; then | |
| 16 | - apt-get -yq install curl dialog git nano screen zsh | |
| 17 | -else | |
| 18 | - if [ "$UID" != 0 ]; then CMD_PREFIX="sudo"; else CMD_PREFIX=""; fi | |
| 15 | +if [ ! -n "$DONTINSTALL" ]; then | |
| 16 | + DONTINSTALL="1" | |
| 17 | +fi | |
| 18 | + | |
| 19 | +if [ ! $DONTINSTALL ]; then | |
| 20 | + if [ -d /proc/vz ] && [ ! -d /proc/vz/beancounter ]; then | |
| 21 | + apt-get -yq install curl dialog git nano screen zsh | |
| 22 | + else | |
| 23 | + if [ "$UID" != 0 ]; then CMD_PREFIX="sudo"; else CMD_PREFIX=""; fi | |
| 19 | 24 | |
| 20 | - if [ "$SHELL" != "$(which zsh)" ]; then | |
| 21 | - echo "$(which zsh)" | |
| 22 | - $CMD_PREFIX echo "enter pass...." | |
| 25 | + if [ "$SHELL" != "$(which zsh)" ]; then | |
| 26 | + echo "$(which zsh)" | |
| 27 | + $CMD_PREFIX echo "enter pass...." | |
| 23 | 28 | |
| 24 | - echo "ok" | |
| 29 | + echo "ok" | |
| 25 | 30 | |
| 26 | - $CMD_PREFIX apt-get -yq install curl dialog git nano zsh | |
| 31 | + $CMD_PREFIX apt-get -yq install curl dialog git nano zsh | |
| 32 | + fi | |
| 27 | 33 | fi |
| 28 | 34 | fi |
| 29 | 35 |