From a39146962147498feea343d62d259d1c81031b4a Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Mon, 28 Jul 2008 15:52:17 +0200 Subject: [PATCH] jobs/: Include shlib.sh from @basedir@, substituted in install.sh --- install.sh | 4 ++++ jobs/clone.sh | 2 +- jobs/clonecheck.sh | 2 +- jobs/update.sh | 2 +- jobs/updatecheck.sh | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index ae83769..ed0ea1b 100755 --- a/install.sh +++ b/install.sh @@ -23,6 +23,10 @@ cp -a Girocco gitweb html jobs toolbox apache.conf update-hook "$cfg_basedir" [ "$GIROCCO_CONF" = "Girocco::Config" ] || cp "$(echo "$GIROCCO_CONF" | sed 's#::#/#g; s/$/.pm/')" "$cfg_basedir/Girocco/Config.pm" +echo "*** Preprocessing scripts..." +perl -I. -M$GIROCCO_CONF -i -pe 's/\@basedir\@/$Girocco::Config::basedir/g' "$cfg_basedir"/jobs/*.sh + + if [ -n "$cfg_mirror" ]; then echo "*** Setting up mirror queue..." mkdir -p "$cfg_mqueuedir/to-clone" "$cfg_mqueuedir/cloning" diff --git a/jobs/clone.sh b/jobs/clone.sh index fd23e4a..d47a3c0 100755 --- a/jobs/clone.sh +++ b/jobs/clone.sh @@ -1,6 +1,6 @@ #!/bin/bash -. shlib.sh +. @basedir@/shlib.sh set -e diff --git a/jobs/clonecheck.sh b/jobs/clonecheck.sh index ed975d1..d95b339 100755 --- a/jobs/clonecheck.sh +++ b/jobs/clonecheck.sh @@ -1,6 +1,6 @@ #!/bin/sh -. shlib.sh +. @basedir@/shlib.sh shopt -s nullglob diff --git a/jobs/update.sh b/jobs/update.sh index 93302c7..fe77742 100755 --- a/jobs/update.sh +++ b/jobs/update.sh @@ -1,6 +1,6 @@ #!/bin/bash -. shlib.sh +. @basedir@/shlib.sh set -e diff --git a/jobs/updatecheck.sh b/jobs/updatecheck.sh index 982707a..b7fb020 100755 --- a/jobs/updatecheck.sh +++ b/jobs/updatecheck.sh @@ -1,6 +1,6 @@ #!/bin/bash -. shlib.sh +. @basedir@/shlib.sh if [ -e /tmp/gitupdatelock ]; then echo "Locked!" >&2 -- 2.11.4.GIT