Don't require to be installed in ~/pld-builder.new

diff --git a/PLD_Builder/path.py b/PLD_Builder/path.py
index 04edf3c05431769f0ef713ca11f5225afb6ae11e..1558ab9f30a064aa8561e13a944857a13f6f4742 100644 (file)
--- a/PLD_Builder/path.py
+++ b/PLD_Builder/path.py
@@ -1,8 +1,10 @@
 # vi: encoding=utf-8 ts=8 sts=4 sw=4 et
 
-import os.path
+import os
 
-root_dir = os.path.expanduser('~/pld-builder.new')
+root_dir = os.getenv('BUILDERPATH')
+if root_dir is None:
+    root_dir = os.path.expanduser('~/pld-builder.new')
 conf_dir = root_dir + "/config"
 spool_dir = root_dir + "/spool"
 lock_dir = root_dir + "/lock"

diff --git a/admin/fresh-queue.sh b/admin/fresh-queue.sh
index 0fbd4c1f7a0d973f7a338ca90043671cc809defa..5d80086a38e873d4df4d5b06662b1af506ba2524 100755 (executable)
--- a/admin/fresh-queue.sh
+++ b/admin/fresh-queue.sh
@@ -2,16 +2,21 @@
 
 umask 077
 
-if [ -d "$HOME/pld-builder.new/" ]; then
-       cd "$HOME/pld-builder.new/"
+CONFIG=$HOME/.pldbuilderrc
+[ -f "$CONFIG" ] && . $CONFIG
+[ -n "$BUILDERPATH" ] || BUILDERPATH="$HOME/pld-builder.new/"
+export BUILDERPATH
+
+if [ -d "$BUILDERPATH" ]; then
+       cd "$BUILDERPATH"
 else
-       echo "the '$HOME/pld-builder.new/' directory does not exist"
+       echo "the $BUILDERPATH directory does not exist"
        exit 1
 fi
 
 
-if [ -f "$HOME/pld-builder.new/config/global" ]; then
-       . $HOME/pld-builder.new/config/global
+if [ -f "$BUILDERPATH/config/global" ]; then
+       . $BUILDERPATH/config/global
 fi
 
 if [ "$1" != "y" ] ; then

diff --git a/bin/file-sender.sh b/bin/file-sender.sh
index 29c9a7cb1965bc6189a6badd214b88a67dc8aba8..5babb4ca21e00f337fa7510d7d5c587250a6fb3b 100644 (file)
--- a/bin/file-sender.sh
+++ b/bin/file-sender.sh
@@ -2,5 +2,11 @@
 
 umask 022
 export LC_CTYPE=en_US.iso-8859-1
-cd ~/pld-builder.new
+
+CONFIG=$HOME/.pldbuilderrc
+[ -f "$CONFIG" ] && . $CONFIG
+[ -n "$BUILDERPATH" ] || BUILDERPATH="$HOME/pld-builder.new/"
+export BUILDERPATH
+
+cd $BUILDERPATH
 exec python PLD_Builder/file_sender.py

diff --git a/bin/load-balancer.sh b/bin/load-balancer.sh
index 56da15f19f84337cd87c9a4a7784f054b8fa052a..055306af57848d6c38271692a9985a54b36857ae 100644 (file)
--- a/bin/load-balancer.sh
+++ b/bin/load-balancer.sh
@@ -2,5 +2,11 @@
 
 umask 022
 export LC_CTYPE=en_US.iso-8859-1
-cd ~/pld-builder.new
+
+CONFIG=$HOME/.pldbuilderrc
+[ -f "$CONFIG" ] && . $CONFIG
+[ -n "$BUILDERPATH" ] || BUILDERPATH="$HOME/pld-builder.new/"
+export BUILDERPATH
+
+cd $BUILDERPATH
 exec python PLD_Builder/load_balancer.py

diff --git a/bin/maintainer.sh b/bin/maintainer.sh
index 684e94bbdf9dcd71108cbed2c6da215317ea67ef..e490b02d23d77565b044ae7428e8ceed555bdb18 100644 (file)
--- a/bin/maintainer.sh
+++ b/bin/maintainer.sh
@@ -2,5 +2,11 @@
 
 umask 022
 export LC_CTYPE=en_US.iso-8859-1
-cd ~/pld-builder.new
+
+CONFIG=$HOME/.pldbuilderrc
+[ -f "$CONFIG" ] && . $CONFIG
+[ -n "$BUILDERPATH" ] || BUILDERPATH="$HOME/pld-builder.new/"
+export BUILDERPATH
+
+cd $BUILDERPATH
 exec python PLD_Builder/maintainer.py

diff --git a/bin/request-fetcher.sh b/bin/request-fetcher.sh
index 048745add7c1d611435715dde26348d8d08634f3..1b446f7e891c65d869d248fcbbecc31973fe428b 100644 (file)
--- a/bin/request-fetcher.sh
+++ b/bin/request-fetcher.sh
@@ -2,5 +2,11 @@
 
 umask 022
 export LC_CTYPE=en_US.iso-8859-1
-cd ~/pld-builder.new
+
+CONFIG=$HOME/.pldbuilderrc
+[ -f "$CONFIG" ] && . $CONFIG
+[ -n "$BUILDERPATH" ] || BUILDERPATH="$HOME/pld-builder.new/"
+export BUILDERPATH
+
+cd $BUILDERPATH
 exec python PLD_Builder/request_fetcher.py

diff --git a/bin/request-handler.sh b/bin/request-handler.sh
index 38f689c75f56e338fec7795f7f711a75208c2f7f..8c2ab85f17c32f612eb6c01d4d79ec9c1253d50f 100755 (executable)
--- a/bin/request-handler.sh
+++ b/bin/request-handler.sh
@@ -2,10 +2,14 @@
 
 umask 022
 export LC_CTYPE=en_US.iso-8859-1
+CONFIG=$HOME/.pldbuilderrc
+[ -f "$CONFIG" ] && . $CONFIG
+[ -n "$BUILDERPATH" ] || BUILDERPATH="$HOME/pld-builder.new/"
+export BUILDERPATH
 
 if lockfile -r3 $HOME/.builder_request_handler.lock 2>/dev/null; then
        trap "rm -f $HOME/.builder_request_handler.lock" 1 2 3 13 15
-       cd ~/pld-builder.new
+       cd $BUILDERPATH
        python PLD_Builder/request_handler.py
        rm -f $HOME/.builder_request_handler.lock
 else

diff --git a/bin/rpm-builder.sh b/bin/rpm-builder.sh
index 96bb6be78de757d58941db16208af6b17e93fbc1..7e678e2c66d548018b3966ec9229e6419ebaf80a 100644 (file)
--- a/bin/rpm-builder.sh
+++ b/bin/rpm-builder.sh
@@ -2,5 +2,10 @@
 
 umask 022
 export LC_CTYPE=en_US.iso-8859-1
-cd ~/pld-builder.new
+CONFIG=$HOME/.pldbuilderrc
+[ -f "$CONFIG" ] && . $CONFIG
+[ -n "$BUILDERPATH" ] || BUILDERPATH="$HOME/pld-builder.new/"
+export BUILDERPATH
+
+cd $BUILDERPATH
 exec python PLD_Builder/rpm_builder.py $1

diff --git a/bin/src-builder.sh b/bin/src-builder.sh
index 6c11d97f973b1fbfc6cd6e3fec5426faf8e7f736..c17e36be4911a59c30c94c79289ae36958f4176b 100644 (file)
--- a/bin/src-builder.sh
+++ b/bin/src-builder.sh
@@ -2,5 +2,10 @@
 
 umask 022
 export LC_CTYPE=en_US.iso-8859-1
-cd ~/pld-builder.new
+CONFIG=$HOME/.pldbuilderrc
+[ -f "$CONFIG" ] && . $CONFIG
+[ -n "$BUILDERPATH" ] || BUILDERPATH="$HOME/pld-builder.new/"
+export BUILDERPATH
+
+cd $BUILDERPATH
 exec python PLD_Builder/srpm_builder.py