Adjust for karaf 4 not happening in carbon

[releng/builder.git] / jenkins-scripts / jenkins-init-script.sh

diff --git a/jenkins-scripts/jenkins-init-script.sh b/jenkins-scripts/jenkins-init-script.sh
index dfb5ee8587b420f2c3069cfc26eb79a87a2ceb35..fe327e3f544fbcfe28e9bcefcde7364521a3dd50 100755 (executable)
--- a/jenkins-scripts/jenkins-init-script.sh
+++ b/jenkins-scripts/jenkins-init-script.sh
@@ -9,11 +9,18 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
-cd /builder/jenkins-scripts
-chmod +x *.sh
+cd /builder/jenkins-scripts || exit 1
+chmod +x -- *.sh
 ./system_type.sh
 
+# shellcheck disable=SC1091
 source /tmp/system_type.sh
 ./basic_settings.sh
+"./${SYSTEM_TYPE}.sh"
+
+# Create the jenkins user last so that hopefully we don't have to deal with
+# guard files
 ./create_jenkins_user.sh
-./${SYSTEM_TYPE}.sh
+
+## add local environment changes post scripts
+./jenkins-init-script-local-env.sh