diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-06-22 16:05:43 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-06-22 16:27:47 +0300 |
| commit | 9de9ac647882612a9aef5b7d4603068fb7c885f9 (patch) | |
| tree | df46559d072b514c24ed05818df9a9002a24a4a3 | |
| parent | 7e127f1832452953be6a9fd319174dbf91cbfcb6 (diff) | |
| download | manaplus-9de9ac647882612a9aef5b7d4603068fb7c885f9.tar.gz manaplus-9de9ac647882612a9aef5b7d4603068fb7c885f9.tar.bz2 manaplus-9de9ac647882612a9aef5b7d4603068fb7c885f9.tar.xz manaplus-9de9ac647882612a9aef5b7d4603068fb7c885f9.zip | |
In ci scripts check for shell runners and skip apt-get if detected.
| -rwxr-xr-x | tools/ci/scripts/init.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/tools/ci/scripts/init.sh b/tools/ci/scripts/init.sh index 6bd9eb50c..f26c6ea48 100755 --- a/tools/ci/scripts/init.sh +++ b/tools/ci/scripts/init.sh @@ -18,6 +18,11 @@ function do_init { } function update_repos { + if [ "$RUNFROMSHELL" != "" ]; + then + echo "Running from shell. Skipping update repos" + return + fi export DATA=$(cat /etc/resolv.conf|grep "nameserver 1.10.100.101") echo "${DATA}" if [ "$DATA" != "" ]; @@ -28,6 +33,11 @@ function update_repos { } function aptget_update { + if [ "$RUNFROMSHELL" != "" ]; + then + echo "Running from shell. Skipping apt-get update" + return + fi echo "apt-get update" apt-get update if [ "$?" != 0 ]; then @@ -53,6 +63,11 @@ function aptget_update { } function aptget_install { + if [ "$RUNFROMSHELL" != "" ]; + then + echo "Running from shell. Skipping apt-get install" + return + fi echo "apt-get -y -qq install $*" apt-get -y -qq install $* if [ "$?" != 0 ]; then |