diff --git a/scripts/mkimage.sh b/scripts/mkimage.sh old mode 100644 new mode 100755 index b8203fb2052eb93cefc294a476d857ba33e357e8..baf3380edb91e23d1bf8b6eb6a1f07b88479e5c5 --- 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 old mode 100644 new mode 100755 index 354d174010bb11e9ae75b4494217581c2876621e..408faf3e0b0aae3b79c5aa4a3661312ef133af78 --- 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() {