summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alex@spline.inf.fu-berlin.de>2016-10-04 04:01:20 +0200
committerAlexander Sulfrian <alex@spline.inf.fu-berlin.de>2016-10-04 04:06:04 +0200
commitf77f0fef7182a9757ad26091967a4e19039043ec (patch)
treeea485ee62be0fbf730b809fe79db7d527323df8c
parent166b49bec5c861d2854d198e9421faad88cc3849 (diff)
downloadbcfg2-tools-f77f0fef7182a9757ad26091967a4e19039043ec.tar.gz
bcfg2-tools-f77f0fef7182a9757ad26091967a4e19039043ec.tar.bz2
bcfg2-tools-f77f0fef7182a9757ad26091967a4e19039043ec.zip
Support to execute scripts without /root/bin in PATHHEADmaster
-rwxr-xr-xbuildfile2
-rwxr-xr-xcheck-repo2
-rwxr-xr-xprepare-repository2
-rwxr-xr-xrenew-config2
-rw-r--r--settings.sh1
5 files changed, 5 insertions, 4 deletions
diff --git a/buildfile b/buildfile
index f0c278c..a3d506a 100755
--- a/buildfile
+++ b/buildfile
@@ -1,6 +1,6 @@
#!/bin/sh
-. settings.sh
+. $(dirname $0)/settings.sh
$BINDIR/prepare-repository
verbose=0
diff --git a/check-repo b/check-repo
index 2cdf7bb..54aea2f 100755
--- a/check-repo
+++ b/check-repo
@@ -1,6 +1,6 @@
#!/bin/sh
-. settings.sh
+. $(dirname $0)/settings.sh
DIR="$(mktemp -d)"
trap 'rm -rf "${DIR}"' EXIT INT TERM HUP
diff --git a/prepare-repository b/prepare-repository
index c418699..c9beb40 100755
--- a/prepare-repository
+++ b/prepare-repository
@@ -1,6 +1,6 @@
#/bin/sh
-. settings.sh
+. $(dirname $0)/settings.sh
DIR="$REPO"
if [ -n "$1" -a -d "$1" ]; then
diff --git a/renew-config b/renew-config
index 5ed1b2d..7544e50 100755
--- a/renew-config
+++ b/renew-config
@@ -1,6 +1,6 @@
#!/bin/sh
-. settings.sh
+. $(dirname $0)/settings.sh
echo "Checking repository. Please wait..."
cd "$REPO" >/dev/null
diff --git a/settings.sh b/settings.sh
index 0f1523c..0525381 100644
--- a/settings.sh
+++ b/settings.sh
@@ -2,6 +2,7 @@ REPO="/root/repo"
REAL="/var/lib/bcfg2"
OLDPWD="$(pwd)"
BINDIR="$( cd -P "$( dirname -- "$0" )" >/dev/null && pwd )"
+PATH="$HOME/bin:$PATH"
error() {
echo "$@" 1>&2