Merge branch 'master' of git.str8.biz:mj/zsh-config

mj
2 parents bd6d233d9b 116d12317c
Showing 1 changed file Side-by-side Diff
tools/install.sh
@@ -12,7 +12,7 @@
  
 set -e
  
-if [ -d /proc/vz ] && [ ! -d /proc/vz/beancounter ]; then
+if [ -d /proc/vz ] && [ ! -d /proc/vz/beancounter ] && [ ! $DONTINSTALL ]; then
 	apt-get -yq install curl dialog git nano zsh
 else
 	if [ "$UID" != "0" ]; then CMD_PREFIX="sudo"; else CMD_PREFIX=""; fi
...	...	@@ -12,7 +12,7 @@
12	12
13	13	set -e
14	14
15		-if [ -d /proc/vz ] && [ ! -d /proc/vz/beancounter ]; then
	15	+if [ -d /proc/vz ] && [ ! -d /proc/vz/beancounter ] && [ ! $DONTINSTALL ]; then
16	16	apt-get -yq install curl dialog git nano zsh
17	17	else
18	18	if [ "$UID" != "0" ]; then CMD_PREFIX="sudo"; else CMD_PREFIX=""; fi