[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible fdroid: hard code WORKSPACE dir names

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit d7134a10b5567c9e5eb11161b4696857c2080bc9
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Wed Jun 7 22:16:40 2017 +0200

    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 at layer-acht.org>
---
 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 36d8482..8e4c6bd 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 257c076..a2f42cc 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git