summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2012-10-19 17:19:55 +0200
committerTrygve Laugstøl <trygvis@inamo.no>2012-10-19 17:57:09 +0200
commit7594665262f35f73315104d6ac40ee2256da4755 (patch)
tree839335939b439017d7550514406fde6aba0c81b1 /src
parent83ec9f3e12643de77c7e99be2e85a5415cc29f0c (diff)
downloadapp.sh-apps-jenkins-7594665262f35f73315104d6ac40ee2256da4755.tar.gz
app.sh-apps-jenkins-7594665262f35f73315104d6ac40ee2256da4755.tar.bz2
app.sh-apps-jenkins-7594665262f35f73315104d6ac40ee2256da4755.tar.xz
app.sh-apps-jenkins-7594665262f35f73315104d6ac40ee2256da4755.zip
o APPSH_BASEDIR => APPSH_HOME / APPSH_APPS.
Diffstat (limited to 'src')
-rw-r--r--src/main/unix/files/root/bin/jenkins6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main/unix/files/root/bin/jenkins b/src/main/unix/files/root/bin/jenkins
index 93c4fc1..4ef37e9 100644
--- a/src/main/unix/files/root/bin/jenkins
+++ b/src/main/unix/files/root/bin/jenkins
@@ -1,8 +1,6 @@
#!/bin/bash -e
-set -x
-
-. $APPSH_BASEDIR/.app/lib/app-conf
+. $APPSH_HOME/.app/lib/app-conf
LOGS=$APPSH_INSTANCE_HOME/logs
@@ -14,7 +12,7 @@ ARGS=()
IFS="
"
-for line in $(get_conf_in_group $APPSH_BASEDIR $APPSH_NAME $APPSH_INSTANCE jenkins)
+for line in $(get_conf_in_group $APPSH_APPS $APPSH_NAME $APPSH_INSTANCE jenkins)
do
ARGS+=("--$line")
done