diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/lib.sh | 9 | ||||
| -rw-r--r-- | include/vendor.sh | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/lib.sh b/include/lib.sh index ac0003f0..19bd9357 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -50,7 +50,7 @@ chkvars() } eval "`setvars "" _nogit board reinstall versiondate aur_notice configdir \ - datadir version relname xbmk_parent`" + datadir version relname`" for fv in version versiondate; do eval "[ ! -f \".$fv\" ] || read -r $fv < \".$fv\" || :" @@ -140,7 +140,12 @@ if [ -z "${TMPDIR+x}" ]; then cd "$XBMK_CACHE/xbmkpath" || $err "can't cd $XBMK_CACHE/xbmkpath" x_ ln -s "`command -v "$python"`" python ) || $err "Can't set up python symlink in $XBMK_CACHE/xbmkpath" - xbmk_parent="y" + + xbmk_rval=0 + ./mk "$@" || xbmk_rval=1 + rm -Rf "$TMPDIR" || xbmk_rval=1 + rm -f lock || xbmk_rval=1 + exit $xbmk_rval fi # if "y": a coreboot target won't be built if target.cfg says release="n" diff --git a/include/vendor.sh b/include/vendor.sh index d98bde7e..6af25935 100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -337,7 +337,7 @@ fail_inject() printf "\n\n%s\n\n" "$dontflash" 1>&2 printf "WARNING: File '%s' was NOT modified.\n\n" "$archive" 1>&2 printf "Please MAKE SURE vendor files are inserted before flashing\n\n" - fail "$1" + $err "$1" } vendor_inject() |