Commit c07932eec342d6ac979b4a7ac8b0abe9730f8365
1 parent
14aa2d6047
Exists in
master
and in
2 other branches
FIX install.sh: no sudo in vz ct
Showing 1 changed file with 10 additions and 6 deletions Side-by-side Diff
tools/install.sh
| ... | ... | @@ -12,15 +12,19 @@ |
| 12 | 12 | |
| 13 | 13 | set -e |
| 14 | 14 | |
| 15 | -if [ "$UID" != "0" ]; then CMD_PREFIX="sudo"; else CMD_PREFIX=""; fi | |
| 15 | +if [ -d /proc/vz ] && [ ! -d /proc/vz/beancounter ]; then | |
| 16 | + apt-get -yq install curl dialog git nano zsh | |
| 17 | +else | |
| 18 | + if [ "$UID" != "0" ]; then CMD_PREFIX="sudo"; else CMD_PREFIX=""; fi | |
| 16 | 19 | |
| 17 | -if [ "$SHELL" != "$(which zsh)" ]; then | |
| 18 | - echo "$(which zsh)" | |
| 19 | - $CMD_PREFIX echo "enter pass...." | |
| 20 | + if [ "$SHELL" != "$(which zsh)" ]; then | |
| 21 | + echo "$(which zsh)" | |
| 22 | + $CMD_PREFIX echo "enter pass...." | |
| 20 | 23 | |
| 21 | - echo "ok" | |
| 24 | + echo "ok" | |
| 22 | 25 | |
| 23 | - $CMD_PREFIX apt-get -yq install curl dialog git nano zsh | |
| 26 | + $CMD_PREFIX apt-get -yq install curl dialog git nano zsh | |
| 27 | + fi | |
| 24 | 28 | fi |
| 25 | 29 | |
| 26 | 30 | if [ "1" == "2" ]; then |