Re: [Libreoffice] [PATCH] start-lo-jenkins.sh without hardcoded install path

Makes it easier to move the jenkins install directory without the need to change
paths in 'start-lo-jenkins.sh'

This script could now be placed as a file in the contrib/devtools/ubuntu-jenkins
dir alternative to being generated by setup-ubuntu-jenkins.sh as it currently is.
I'm not sure what's preferable.



--Henrik Jensen

(HenrikJ on #libreoffice-dev)

From c7e5ebcd8ab67cab192047e1fa7e211132bd419c Mon Sep 17 00:00:00 2001
From: Henrik Jensen <hrikjsenvagt-lo@yahoo.dk>
Date: Mon, 15 Aug 2011 22:04:57 +0200
Subject: [PATCH] start-lo-jenkins.sh without hardcoded install path

This script could now be placed as a file in the contrib/devtools/ubuntu-jenkins
dir alternative to being generated by setup-ubuntu-jenkins.sh as it currently is.
I'm not sure what's preferable.
---
 ubuntu-jenkins/setup-ubuntu-jenkins.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ubuntu-jenkins/setup-ubuntu-jenkins.sh b/ubuntu-jenkins/setup-ubuntu-jenkins.sh
index c2a5957..4890909 100755
--- a/ubuntu-jenkins/setup-ubuntu-jenkins.sh
+++ b/ubuntu-jenkins/setup-ubuntu-jenkins.sh
@@ -20,7 +20,8 @@ git clone git://anongit.freedesktop.org/libreoffice/contrib/dev-tools dev-tools
 mv dev-tools/ubuntu-jenkins/jobs jobs
 rm -rf dev-tools
 echo "#!/bin/sh" > start-lo-jenkins.sh
-echo "java -DJENKINS_HOME=$(pwd) -jar $(pwd)/jenkins.war">> start-lo-jenkins.sh
+echo 'SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"' >> start-lo-jenkins.sh
+echo 'java -DJENKINS_HOME=$SCRIPT_DIR -jar $SCRIPT_DIR/jenkins.war' >> start-lo-jenkins.sh
 chmod u+x start-lo-jenkins.sh
 echo "done."
 echo "You can start your LibreOffice Ubuntu Jenkins server with: $(pwd)/start-lo-jenkins.sh"
-- 
1.7.4.1