summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans-Christoph Steiner <hans@eds.org>2017-06-07 22:16:40 +0200
committerHolger Levsen <holger@layer-acht.org>2017-06-08 00:34:29 +0200
commitd7134a10b5567c9e5eb11161b4696857c2080bc9 (patch)
tree26853cd774955af5ee8dc675b17e0dd727a6e0fd
parent000d545d03aa46b2dadebc9c53eaccc0b1994faa (diff)
downloadjenkins.debian.net-d7134a10b5567c9e5eb11161b4696857c2080bc9.tar.xz
reproducible fdroid: hard code WORKSPACE dir names
WORKSPACE cannot be generated from $0 since jenkins renames these scripts to things like "jenkins-script-i8GyOyyf" Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rwxr-xr-xbin/reproducible_fdroid_build_apps.sh2
-rwxr-xr-xbin/reproducible_setup_fdroid_build_environment.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/reproducible_fdroid_build_apps.sh b/bin/reproducible_fdroid_build_apps.sh
index 36d8482e..8e4c6bdf 100755
--- a/bin/reproducible_fdroid_build_apps.sh
+++ b/bin/reproducible_fdroid_build_apps.sh
@@ -19,7 +19,7 @@ common_init "$@"
# /srv/jenkins/bin/jenkins_master_wrapper.sh runs this script on the
# slave using a directly call to ssh, so this script has to do all
# of the workspace setup.
-export WORKSPACE=$BASE/`basename $0 | sed 's,\.sh,,'`
+export WORKSPACE=$BASE/reproducible_fdroid_build_apps
if [ -e $WORKSPACE/.git ]; then
# reuse the git repo if possible, to keep all the setup in fdroiddata/
cd $WORKSPACE
diff --git a/bin/reproducible_setup_fdroid_build_environment.sh b/bin/reproducible_setup_fdroid_build_environment.sh
index 257c0767..a2f42cca 100755
--- a/bin/reproducible_setup_fdroid_build_environment.sh
+++ b/bin/reproducible_setup_fdroid_build_environment.sh
@@ -19,7 +19,7 @@ common_init "$@"
# /srv/jenkins/bin/jenkins_master_wrapper.sh runs this script on the
# slave using a directly call to ssh, so this script has to do all
# of the workspace setup.
-export WORKSPACE=$BASE/`basename $0 | sed 's,\.sh,,'`
+export WORKSPACE=$BASE/reproducible_setup_fdroid_build_environment
if [ -e $WORKSPACE/.git ]; then
# reuse the git repo if possible, to keep all the setup in fdroiddata/
cd $WORKSPACE