From d7134a10b5567c9e5eb11161b4696857c2080bc9 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 7 Jun 2017 22:16:40 +0200 Subject: 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 --- bin/reproducible_fdroid_build_apps.sh | 2 +- bin/reproducible_setup_fdroid_build_environment.sh | 2 +- 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 -- cgit v1.2.3-54-g00ecf