diff options
| -rw-r--r-- | include/git.sh | 6 | ||||
| -rw-r--r-- | include/init.sh | 4 | ||||
| -rw-r--r-- | include/inject.sh | 31 | ||||
| -rw-r--r-- | include/lib.sh | 2 | ||||
| -rw-r--r-- | include/mrc.sh | 22 | ||||
| -rw-r--r-- | include/release.sh | 18 | ||||
| -rw-r--r-- | include/tree.sh | 2 |
7 files changed, 43 insertions, 42 deletions
diff --git a/include/git.sh b/include/git.sh index 9440b1af..bbc5140e 100644 --- a/include/git.sh +++ b/include/git.sh @@ -61,7 +61,7 @@ git_prep() [ "$XBMK_RELEASE" = "y" ] && rmgit "$tmpgit" [ "$_loc" = "${_loc%/*}" ] || x_ mkdir -p "${_loc%/*}" - mv "$tmpgit" "$_loc" || err "git_prep: !mv $tmpgit $_loc" + x_ mv "$tmpgit" "$_loc" } fetch_submodule() @@ -82,7 +82,7 @@ fetch_submodule() [ "$st" = "file" ] && xbmkget "$subfile" "$subfile_bkup" \ "$tmpgit/$1" "$subhash" && return 0 - rm -Rf "$tmpgit/$1" || err "!rm '$mdir' '$1'" + x_ rm -Rf "$tmpgit/$1" tmpclone "$subrepo" "$subrepo_bkup" "$tmpgit/$1" "$subhash" \ "$mdir/${1##*/}/patches" } @@ -101,6 +101,6 @@ nuke() { e "config/${1%/}/nuke.list" f missing || while read -r nukefile; do rmf="src/${2%/}/$nukefile" && [ -L "$rmf" ] && continue - e "$rmf" e missing || rm -Rf "$rmf" || err "!rm $rmf, ${2%/}" + e "$rmf" e missing || x_ rm -Rf "$rmf" done < "config/${1%/}/nuke.list"; : } diff --git a/include/init.sh b/include/init.sh index b9cb81b1..2eea04c0 100644 --- a/include/init.sh +++ b/include/init.sh @@ -45,7 +45,7 @@ xbmkpkg() eval "`setcfg "config/dependencies/$2"`" chkvars pkg_add pkglist - $pkg_add $pkglist || err "Cannot install packages" + x_ $pkg_add $pkglist [ -n "$aur_notice" ] && \ printf "You need AUR packages: %s\n" "$aur_notice" 1>&2; : @@ -200,7 +200,7 @@ xbmk_create_pathdirs() ( # set up python v3.x in PATH, in case it's not set up correctly. # see code above that detected the correct python3 command. - cd "$XBMK_CACHE/xbmkpath" || err "can't cd $XBMK_CACHE/xbmkpath" + x_ cd "$XBMK_CACHE/xbmkpath" x_ ln -s "`pybin "$python"`" python ) || err "Can't set up python symlink in $XBMK_CACHE/xbmkpath"; : } diff --git a/include/inject.sh b/include/inject.sh index 135df0c2..476b7eb0 100644 --- a/include/inject.sh +++ b/include/inject.sh @@ -121,7 +121,7 @@ fetch() dlop="curl" && [ $# -gt 5 ] && dlop="$6" xbmkget "$dl" "$dl_bkup" "$_dl" "$dlsum" "$dlop" - rm -Rf "${_dl}_extracted" || err "!rm ${_ul}_extracted. $dontflash" + x_ rm -Rf "${_dl}_extracted" e "$_dest" f && return 0 x_ mkdir -p "${_dest%/*}" @@ -162,7 +162,7 @@ extract_intel_me() find_me() { - e "$_metmp" f && exit 1 + [ -f "$_metmp" ] && exit 1 [ -L "$1" ] && return 0 _7ztest="${_7ztest}a" && _r="-r" && [ -n "$mfs" ] && _r="" @@ -171,7 +171,7 @@ find_me() "$mecleaner" $mfs $_r -t -O "$_metmp" "$1" || "$me7updateparser" \ -O "$_metmp" "$1" || extract_archive "$1" "$_7ztest" || return 0 - e "$_metmp" f && exit 1 + [ -f "$_metmp" ] && exit 1 ( fx_ find_me x_ find "$_7ztest" -type f ) || exit 1; : } @@ -219,7 +219,7 @@ extract_sch5545ec() _sch5545ec_fw="$_sch5545ec_fw/54 D386BEB8-4B54-4E69-94F5-06091F67E0D3" _sch5545ec_fw="$_sch5545ec_fw/0 Raw section/body.bin" # <-- this! - "$uefiextract" "$_bios" || err "sch5545 !extract - $dontflash" + x_ "$uefiextract" "$_bios" x_ cp "$_sch5545ec_fw" "$_dest" } @@ -345,7 +345,7 @@ patch_release_roms() fx_ prep x_ find "$tmpromdir" -maxdepth 1 -type f -name "*.rom" ( - cd "$tmpromdir" || err "patch '$archive': can't cd $tmpromdir" + x_ cd "$tmpromdir" # NOTE: For compatibility with older rom releases, defer to sha1 if [ "$has_hashes" = "y" ] && [ "$nukemode" != "nuke" ]; then sha512sum --status -c "$hashfile" || \ @@ -385,7 +385,7 @@ prep() [ $xromsize -lt 524288 ] && err "too small, $xromsize: $_xrom" x_ dd if="$_xrom" of="$_xromnew" bs=$xromsize count=1 - rm -f "$_xrom" || err "Can't rm $_xrom - $dontflash" + x_ rm -f "$_xrom" _xrom="$_xromnew" fi @@ -455,21 +455,20 @@ insert() [ "$nukemode" = "nuke" ] || x_ e "$_dest" f if [ "$cbfsname" = "IFD" ]; then - [ "$nukemode" = "nuke" ] || "$ifdtool" $ifdprefix -i \ - $_t:$_dest "$rom" -O "$rom" || \ - err "failed: insert '$_t' '$_dest' on '$rom'" - [ "$nukemode" != "nuke" ] || "$ifdtool" $ifdprefix --nuke $_t \ - "$rom" -O "$rom" || err "$rom: !nuke IFD/$_t" + [ "$nukemode" = "nuke" ] || x_ "$ifdtool" $ifdprefix -i \ + $_t:$_dest "$rom" -O "$rom" + [ "$nukemode" != "nuke" ] || x_ "$ifdtool" $ifdprefix --nuke \ + $_t "$rom" -O "$rom" elif [ "$nukemode" = "nuke" ]; then x_ "$cbfstool" "$rom" remove -n "$cbfsname" elif [ "$_t" = "stage" ]; then # the only stage we handle is refcode x_ rm -f "$xbmklocal/refcode" - "$rmodtool" -i "$_dest" -o "$xbmklocal/refcode" || "!reloc ref" - "$cbfstool" "$rom" add-stage -f "$xbmklocal/refcode" \ - -n "$cbfsname" -t stage || err "$rom: !add ref" + x_ "$rmodtool" -i "$_dest" -o "$xbmklocal/refcode" + x_ "$cbfstool" "$rom" add-stage -f "$xbmklocal/refcode" \ + -n "$cbfsname" -t stage else - "$cbfstool" "$rom" add -f "$_dest" -n "$cbfsname" \ - -t $_t $_offset || err "$rom !add $_t ($_dest)" + x_ "$cbfstool" "$rom" add -f "$_dest" -n "$cbfsname" \ + -t $_t $_offset fi xchanged="y"; : } diff --git a/include/lib.sh b/include/lib.sh index 99e59a1a..2f87e8b1 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -58,7 +58,7 @@ xbmkget() for url in "$1" "$2"; do [ "$dl_fail" = "n" ] && break [ -z "$url" ] && continue - rm -f "$cached" || err "!rm -f '$cached'" + x_ rm -f "$cached" if [ "$_dlop" = "curl" ]; then curl --location --retry 3 -A "$_ua" "$url" \ -o "$cached" || wget --tries 3 -U "$_ua" "$url" \ diff --git a/include/mrc.sh b/include/mrc.sh index a1dcb140..3b3089fc 100644 --- a/include/mrc.sh +++ b/include/mrc.sh @@ -10,8 +10,8 @@ extract_mrc() { extract_shellball - "$cbfstool" "$appdir/"bios.bin extract -n mrc.bin \ - -f "$_dest" -r RO_SECTION || err "extract_mrc: !$cbfstool $_dest" + x_ "$cbfstool" "$appdir/"bios.bin extract -n mrc.bin \ + -f "$_dest" -r RO_SECTION [ -n "$CONFIG_REFCODE_BLOB_FILE" ] && extract_refcode extra; : } @@ -23,18 +23,20 @@ extract_refcode() [ $# -lt 1 ] && extract_shellball - # cbfstool changed the attributes scheme for stage files, - # incompatible with older versions before coreboot 4.14, - # so we need coreboot 4.13 cbfstool for certain refcode files + # cbfstool after coreboot 4.13 changed the stage file attribute scheme, + # and refcode is extracted from an image using the old scheme. we use + # cbfstool from coreboot 4.11_branch, the tree used by ASUS KGPE-D16 chkvars cbfstoolref - mkdir -p "${_refdest%/*}" || err "ref: !mkdir -p ${_refdest%/*}" + x_ mkdir -p "${_refdest%/*}" x_ "$cbfstoolref" "$appdir/bios.bin" extract \ - -m x86 -n fallback/refcode -f "$_refdest" -r RO_SECTION + -m x86 -n fallback/refcode -f "$appdir/ref" -r RO_SECTION # enable the Intel GbE device, if told by offset MRC_refcode_gbe [ -z "$MRC_refcode_gbe" ] || x_ dd if="config/ifd/hp820g2/1.bin" \ - of="$_refdest" bs=1 seek=$MRC_refcode_gbe count=1 conv=notrunc; : + of="$appdir/ref" bs=1 seek=$MRC_refcode_gbe count=1 conv=notrunc; : + + x_ mv "$appdir/ref" "$_refdest" } extract_shellball() @@ -58,8 +60,8 @@ extract_partition() START=$(( $( echo $ROOTP | cut -f2 -d\ | tr -d "B" ) )) SIZE=$(( $( echo $ROOTP | cut -f4 -d\ | tr -d "B" ) )) - dd if="${1%.zip}" of="root-a.ext2" bs=1024 skip=$(( $START / 1024 )) \ - count=$(( $SIZE / 1024 )) || err "ex dd ${1%.zip}, root-a.ext2" + x_ dd if="${1%.zip}" of="root-a.ext2" bs=1024 skip=$(( $START / 1024 )) \ + count=$(( $SIZE / 1024 )) printf "cd /usr/sbin\ndump chromeos-firmwareupdate %s\nquit" \ "$SHELLBALL" | debugfs "root-a.ext2" || err "!extract shellball" diff --git a/include/release.sh b/include/release.sh index 2f9f2b86..4741b44a 100644 --- a/include/release.sh +++ b/include/release.sh @@ -22,9 +22,9 @@ release() relsrcdir="$vdir/$src_dirname" [ -e "$vdir" ] && err "already exists: \"$vdir\"" - mkdir -p "$vdir" || err "mkvdir: !mkdir -p \"$vdir\"" - git clone . "$relsrcdir" || err "mkdir: !gitclone \"$relsrcdir\"" - touch "$relsrcdir/lock" || err "can't make lock file in $relsrcdir/" + x_ mkdir -p "$vdir" + x_ git clone . "$relsrcdir" + x_ touch "$relsrcdir/lock" build_release @@ -34,7 +34,7 @@ release() build_release() { ( - cd "$relsrcdir" || err "$vdir: !cd \"$relsrcdir\"" + x_ cd "$relsrcdir" x_ ./mk -f rmgit . @@ -43,17 +43,17 @@ build_release() git log --graph --pretty=format:'%Cred%h%Creset %s %Creset' \ --abbrev-commit > "$relsrcdir/CHANGELOG" || err "!log $relsrcdir" - rm -f "$relsrcdir/lock" || err "can't remove lock file in $relsrcdir" + x_ rm -f "$relsrcdir/lock" ( - cd "${relsrcdir%/*}" || err "$vdir: mktarball \"$relsrcdir\"" + x_ cd "${relsrcdir%/*}" x_ mktarball "${relsrcdir##*/}" "${relsrcdir##*/}.tar.xz" ) || err "can't create src tarball" [ "$relmode" = "src" ] && return 0 - touch "$relsrcdir/lock" || err "can't make lock file in $relsrcdir/" + x_ touch "$relsrcdir/lock" ( - cd "$relsrcdir" || err "$vdir: 2 !cd \"$relsrcdir\"" + x_ cd "$relsrcdir" x_ ./mk -d coreboot mk -b coreboot pico-serprog stm32-vserprog pcsx-redux @@ -61,5 +61,5 @@ build_release() x_ mv bin ../roms ) || err "can't build rom images" - rm -Rf "$relsrcdir" || err "!rm -Rf $relsrcdir" + x_ rm -Rf "$relsrcdir" } diff --git a/include/tree.sh b/include/tree.sh index 4d0c533d..47f65d10 100644 --- a/include/tree.sh +++ b/include/tree.sh @@ -322,7 +322,7 @@ check_cmake() check_autoconf() { ( - cd "$1" || err "!cd $1" + x_ cd "$1" [ -f "bootstrap" ] && x_ ./bootstrap $bootstrapargs [ -f "autogen.sh" ] && x_ ./autogen.sh $autogenargs [ -f "configure" ] && x_ ./configure $autoconfargs; : |