diff options
| author | Colin Guthrie <colin@mageia.org> | 2014-07-29 21:11:13 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2014-07-29 21:11:13 +0100 |
| commit | c4d7b611eec5b228afed19e53ba9573fc3ac85e1 (patch) | |
| tree | 11fe62699286d918f5e6740ba444ac19629835f6 | |
| parent | 94413eb36fb609eab7873f97926c3ee5c634ea8e (diff) | |
| download | mgatools-c4d7b611eec5b228afed19e53ba9573fc3ac85e1.tar mgatools-c4d7b611eec5b228afed19e53ba9573fc3ac85e1.tar.gz mgatools-c4d7b611eec5b228afed19e53ba9573fc3ac85e1.tar.bz2 mgatools-c4d7b611eec5b228afed19e53ba9573fc3ac85e1.tar.xz mgatools-c4d7b611eec5b228afed19e53ba9573fc3ac85e1.zip | |
Support running the scripts from a direct git clone.
| -rw-r--r-- | functions | 2 | ||||
| -rwxr-xr-x | mga-hdlists | 7 | ||||
| -rwxr-xr-x | mga-hdlists-backports | 7 | ||||
| -rwxr-xr-x | mga-hdlists-cauldron | 7 | ||||
| -rwxr-xr-x | mga-hdlists-updates | 7 | ||||
| -rwxr-xr-x | mga-move-pkg | 7 |
6 files changed, 31 insertions, 6 deletions
@@ -14,7 +14,7 @@ distroreleases='1 2 3 4' arches='i586 x86_64' mirror_rsync_options="--dry-run -v --delete -alH" -. /etc/mgatools.conf +[ -f /etc/mgatools.conf ] && . /etc/mgatools.conf function isingroup() { diff --git a/mga-hdlists b/mga-hdlists index f14407f..37dc31d 100755 --- a/mga-hdlists +++ b/mga-hdlists @@ -2,7 +2,12 @@ set -e -. /usr/share/mgatools/functions +LOCALDIR="$(dirname $0)" +if [ -d "$LOCALDIR/.git" -a -f "$LOCALDIR/functions" ]; then + . "$LOCALDIR/functions" +else + . /usr/share/mgatools/functions +fi if [ "$1" = "--dry-run" ]; then dryrun=echo diff --git a/mga-hdlists-backports b/mga-hdlists-backports index 6a0c19b..9137aa0 100755 --- a/mga-hdlists-backports +++ b/mga-hdlists-backports @@ -2,7 +2,12 @@ set -e -. /usr/share/mgatools/functions +LOCALDIR="$(dirname $0)" +if [ -d "$LOCALDIR/.git" -a -f "$LOCALDIR/functions" ]; then + . "$LOCALDIR/functions" +else + . /usr/share/mgatools/functions +fi if [ "$1" = "--dry-run" ]; then dryrun=echo diff --git a/mga-hdlists-cauldron b/mga-hdlists-cauldron index dc4404c..ca85344 100755 --- a/mga-hdlists-cauldron +++ b/mga-hdlists-cauldron @@ -2,7 +2,12 @@ set -e -. /usr/share/mgatools/functions +LOCALDIR="$(dirname $0)" +if [ -d "$LOCALDIR/.git" -a -f "$LOCALDIR/functions" ]; then + . "$LOCALDIR/functions" +else + . /usr/share/mgatools/functions +fi if [ "$1" = "--dry-run" ]; then dryrun=echo diff --git a/mga-hdlists-updates b/mga-hdlists-updates index 66f3e7e..ee2f71f 100755 --- a/mga-hdlists-updates +++ b/mga-hdlists-updates @@ -2,7 +2,12 @@ set -e -. /usr/share/mgatools/functions +LOCALDIR="$(dirname $0)" +if [ -d "$LOCALDIR/.git" -a -f "$LOCALDIR/functions" ]; then + . "$LOCALDIR/functions" +else + . /usr/share/mgatools/functions +fi if [ "$1" = "--dry-run" ]; then dryrun=echo diff --git a/mga-move-pkg b/mga-move-pkg index 3bfcae3..b757ba9 100755 --- a/mga-move-pkg +++ b/mga-move-pkg @@ -2,7 +2,12 @@ set -e -. /usr/share/mgatools/functions +LOCALDIR="$(dirname $0)" +if [ -d "$LOCALDIR/.git" -a -f "$LOCALDIR/functions" ]; then + . "$LOCALDIR/functions" +else + . /usr/share/mgatools/functions +fi if [ "$1" = "--dry-run" ]; then dryrun=echo |