diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-11-11 14:41:22 -0800 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-11-14 20:10:40 +0000 |
| commit | 48bcd519aee4e80fccff91e2c7f44fc43a01c28f (patch) | |
| tree | 8002cbe67862bab14473ea921a4e73e9baf148ea /scripts | |
| parent | 86da5a104758a199099eee1446f27cdd237754e1 (diff) | |
| download | aports-48bcd519aee4e80fccff91e2c7f44fc43a01c28f.tar.bz2 aports-48bcd519aee4e80fccff91e2c7f44fc43a01c28f.tar.xz | |
scripts/mkimg.base.sh: search for apkovl script
search for apkovl script in current dir, in ~/.mkimg and in the dir
where the mkimage script was started from.
Diffstat (limited to 'scripts')
| -rwxr-xr-x[-rw-r--r--] | scripts/mkimage.sh | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | scripts/mkimg.base.sh | 12 |
2 files changed, 14 insertions, 3 deletions
diff --git a/scripts/mkimage.sh b/scripts/mkimage.sh index b8203fb205..baf3380edb 100644..100755 --- a/scripts/mkimage.sh +++ b/scripts/mkimage.sh @@ -28,7 +28,10 @@ _hostkeys="" _simulate="" _checksum="" +scriptdir="$(dirname $0)" OUTDIR="$PWD" +RELEASE="${build_date}" + msg() { if [ -n "$quiet" ]; then return 0; fi @@ -182,7 +185,7 @@ build_profile() { } # load plugins -load_plugins "$(dirname $0)" +load_plugins "$scriptdir" [ -z "$HOME" ] || load_plugins "$HOME/.mkimage" mkimage_yaml="$(dirname $0)"/mkimage-yaml.sh diff --git a/scripts/mkimg.base.sh b/scripts/mkimg.base.sh index 354d174010..408faf3e0b 100644..100755 --- a/scripts/mkimg.base.sh +++ b/scripts/mkimg.base.sh @@ -52,9 +52,17 @@ section_apks() { } build_apkovl() { - local _host="$1" + local _host="$1" _script= msg "Generating $_host.apkovl.tar.gz" - (local _pwd=$PWD; cd "$DESTDIR"; fakeroot "$_pwd"/"$apkovl" "$_host") + for _script in "$PWD"/"$apkovl" $HOME/.mkimage/$apkovl \ + $(readlink -f "$scriptdir/$apkovl"); do + + if [ -f "$_script" ]; then + break + fi + done + [ -n "$_script" ] || die "could not find $apkovl" + (cd "$DESTDIR"; fakeroot "$_script" "$_host") } section_apkovl() { |