diff options
| -rw-r--r-- | include/get.sh | 2 | ||||
| -rw-r--r-- | include/init.sh | 9 | ||||
| -rw-r--r-- | include/inject.sh | 8 | ||||
| -rw-r--r-- | include/vendor.sh | 14 | ||||
| -rwxr-xr-x | mk | 1 |
5 files changed, 17 insertions, 17 deletions
diff --git a/include/get.sh b/include/get.sh index 2d1de425..4926699b 100644 --- a/include/get.sh +++ b/include/get.sh @@ -5,7 +5,7 @@ eval "`setvars "" loc url bkup_url subcurl subhash subgit subgit_bkup \ depend subcurl_bkup`" -tmpgit="$xbloc/gitclone" +tmpgit="$xbtmp/gitclone" tmpgitcache="$XBMK_CACHE/tmpgit" fetch_targets() diff --git a/include/init.sh b/include/init.sh index aabdd5d4..03c45c1a 100644 --- a/include/init.sh +++ b/include/init.sh @@ -14,13 +14,12 @@ projectsite="https://libreboot.org/" export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games" eval "`setvars "" _nogit board reinstall versiondate aur_notice configdir \ - datadir version xbmkpwd relname xbmkpwd xbtmp python pyver xbloc \ - xbmklock cvxbmk cvchk xbmkpath is_child basetmp`" + datadir version xbmkpwd relname xbmkpwd xbtmp python pyver xbmklock \ + cvxbmk cvchk xbmkpath is_child basetmp`" xbmk_init() { xbmkpwd="`pwd`" || err "Cannot generate PWD" - xbloc="$xbmkpwd/tmp" xbmklock="$xbmkpwd/lock" basetmp="$xbmkpwd/xbmkwd" @@ -86,7 +85,7 @@ xbmk_set_env() xbmk_parent_set_export xbmk_set_version - remkdir "$xbtmp" "$xbloc" "$XBMK_CACHE/gnupath" "$XBMK_CACHE/xbmkpath" + remkdir "$xbtmp" "$XBMK_CACHE/gnupath" "$XBMK_CACHE/xbmkpath" xbmk_set_pyver } @@ -265,7 +264,7 @@ xbmk_child_exec() { xbmk_rval=0 ( x_ ./mk "$@" ) || xbmk_rval=1 - ( x_ rm -Rf "$xbloc" "$xbtmp" ) || xbmk_rval=1 + ( x_ rm -Rf "$xbtmp" ) || xbmk_rval=1 ( x_ rm -f "$xbmklock" ) || xbmk_rval=1 exit $xbmk_rval } diff --git a/include/inject.sh b/include/inject.sh index fa46ee94..77d99874 100644 --- a/include/inject.sh +++ b/include/inject.sh @@ -117,21 +117,21 @@ scankconfig() modify_mac() { - x_ cp "${CONFIG_GBE_BIN_PATH##*../}" "$xbloc/gbe" + x_ cp "${CONFIG_GBE_BIN_PATH##*../}" "$xbtmp/gbe" [ -n "$new_mac" ] && [ "$new_mac" != "restore" ] && \ x_ make -C util/nvmutil clean && x_ make -C util/nvmutil && \ - x_ "$nvm" "$xbloc/gbe" setmac "$new_mac" + x_ "$nvm" "$xbtmp/gbe" setmac "$new_mac" fx_ newmac x_ find "$tmpromdir" -maxdepth 1 -type f -name "*.rom" printf "\nThe following GbE NVM data will be written:\n" - x_ "$nvm" "$xbloc/gbe" dump | grep -v "bytes read from file" || : + x_ "$nvm" "$xbtmp/gbe" dump | grep -v "bytes read from file" || : } newmac() { e "$1" f && xchanged="y" && x_ \ - "$ifdtool" $ifdprefix -i GbE:"$xbloc/gbe" "$1" -O "$1"; : + "$ifdtool" $ifdprefix -i GbE:"$xbtmp/gbe" "$1" -O "$1"; : } remktar() diff --git a/include/vendor.sh b/include/vendor.sh index b04602c1..6e379236 100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -145,9 +145,9 @@ extract_intel_me() { e "$mecleaner" f not && err "$cbdir: me_cleaner missing" - _7ztest="$xbloc/metmp/a" - _metmp="$xbloc/me.bin" - x_ rm -f "$_metmp" "$xbloc/a" + _7ztest="$xbtmp/metmp/a" + _metmp="$xbtmp/me.bin" + x_ rm -f "$_metmp" "$xbtmp/a" mfs="" if [ "$ME11bootguard" = "y" ]; then @@ -176,7 +176,7 @@ find_me() _7ztest="${_7ztest}a" && _r="-r" && [ -n "$mfs" ] && _r="" - "$mecleaner" $mfs $_r -t -O "$xbloc/a" -M "$_metmp" "$1" || \ + "$mecleaner" $mfs $_r -t -O "$xbtmp/a" -M "$_metmp" "$1" || \ "$mecleaner" $mfs $_r -t -O "$_metmp" "$1" || "$me7updateparser" \ -O "$_metmp" "$1" || extract_archive "$1" "$_7ztest" || return 0 @@ -386,9 +386,9 @@ vfile() elif [ "$nuke" = "nuke" ]; then x_ "$cbfstool" "$rom" remove -n "$cbfsname" elif [ "$_t" = "stage" ]; then # the only stage we handle is refcode - x_ rm -f "$xbloc/refcode" - x_ "$rmodtool" -i "$_dest" -o "$xbloc/refcode" - x_ "$cbfstool" "$rom" add-stage -f "$xbloc/refcode" \ + x_ rm -f "$xbtmp/refcode" + x_ "$rmodtool" -i "$_dest" -o "$xbtmp/refcode" + x_ "$cbfstool" "$rom" add-stage -f "$xbtmp/refcode" \ -n "$cbfsname" -t stage else x_ "$cbfstool" "$rom" add -f "$_dest" -n "$cbfsname" \ @@ -37,5 +37,6 @@ main "$@" && exit 0 . "include/tree.sh" trees "$@" || exit 0 +x_ touch "$mkhelpercfg" . "$mkhelpercfg" $cmd |