lib.sh: Simplified fx_() and removed fe_()

Instead of calling fe_, prefix x_ as indicated.

Signed-off-by: Leah Rowe <leah@libreboot.org>

config/data/pico-serprog/mkhelper.cfg

@@ -4,4 +4,4 @@ sersrc="src/pico-serprog"
 serx="$sersrc/build/pico_serprog.uf2"
 picosdk="src/pico-sdk"
 serdir="$picosdk/src/boards/include/boards"
-premake="$dry eval fe_ \"buildser pico\" basename -as .h \"\$serdir/\"*.h"
+premake="$dry eval fx_ \"buildser pico\" x_ basename -as .h \"\$serdir/\"*.h"

config/data/stm32-vserprog/mkhelper.cfg

@@ -3,4 +3,4 @@
 sersrc="src/stm32-vserprog"
 serx="$sersrc/stm32-vserprog.hex"
 serdir="$sersrc/boards"
-mkhelper="$dry eval fe_ \"buildser stm32\" basename -as .h \"\$serdir/\"*.h"
+mkhelper="$dry eval fx_ \"buildser stm32\" x_ basename -as .h \"\$serdir/\"*.h"

include/inject.sh

@@ -49,7 +49,7 @@ download()
 readkconfig()
 {
 	x_ rm -f "$xbmktmp/cbcfg"
-	fe_ scankconfig find "$boarddir/config" -type f
+	fx_ scankconfig x_ find "$boarddir/config" -type f
 
 	eval "`setcfg "$xbmktmp/cbcfg" 1`"
 
@@ -148,7 +148,7 @@ extract_intel_me()
 	    chkvars ME11delta ME11version ME11sku ME11pch
 	[ "$ME11bootguard" = "y" ] && x_ ./mk -f deguard
 
-	set +u +e && fe_ find_me find "$xbmkpwd/$appdir" -type f
+	set +u +e && fx_ find_me x_ find "$xbmkpwd/$appdir" -type f
 	[ "$ME11bootguard" != "y" ] && x_ mv "$_metmp" "$_me" && return 0
 
 	( x_ cd src/deguard/
@@ -169,7 +169,7 @@ find_me()
 	    "$mecleaner" $mfs $_r -t -O "$_metmp" "$1" || "$me7updateparser" \
 	    -O "$_metmp" "$1" || extract_archive "$1" "$_7ztest" || return 0
 
-	fe_ find_me find "$_7ztest" -type f || return 1; :
+	fx_ find_me x_ find "$_7ztest" -type f || return 1; :
 }
 
 extract_archive()
@@ -228,7 +228,8 @@ extract_sch5545ec()
 # https://pcsupport.lenovo.com/us/en/products/laptops-and-netbooks/thinkpad-t-series-laptops/thinkpad-t480-type-20l5-20l6/20l5/solutions/ht508988
 extract_tbfw()
 {
-	chkvars TBFW_size; fe_ copy_tbfw find "$appdir" -type f -name "TBT.bin"
+	chkvars TBFW_size
+	fx_ copy_tbfw x_ find "$appdir" -type f -name "TBT.bin"
 }
 
 copy_tbfw()
@@ -344,7 +345,8 @@ patch_release_roms()
 	done
 
 	if readkconfig; then
-		fe_ preprom find "$tmpromdir" -maxdepth 1 -type f -name "*.rom"
+		fx_ preprom x_ find "$tmpromdir" -maxdepth 1 -type f \
+		    -name "*.rom"
 		[ "$nukemode" != "nuke" ] || \
 			printf "Make sure you inserted vendor files: %s\n" \
 			    "$vguide" > "$tmpromdir/README.md" || :
@@ -492,7 +494,7 @@ modify_mac()
 	[ -n "$new_mac" ] && [ "$new_mac" != "restore" ] && \
 	    x_ "$nvm" "$xbmklocal/gbe" setmac "$new_mac"
 
-	fe_ newmac find "$tmpromdir" -maxdepth 1 -type f -name "*.rom"
+	fx_ newmac x_ find "$tmpromdir" -maxdepth 1 -type f -name "*.rom"
 
 	printf "\nGbE NVM written to '%s':\n" "$archive"
 	x_ "$nvm" "$xbmklocal/gbe" dump | grep -v "bytes read from file" || :

include/lib.sh

@@ -144,23 +144,11 @@ singletree()
 	    return 1
 }
 
-fe_()
-{
-	find_ex "x_" "$@"
-}
-
 fx_()
 {
-	find_ex "" "$@"
-}
-
-find_ex()
-{
-	xmsg="$1" && shift 1
 	fd="`mktemp`" && x_ rm -f "$fd" && x_ touch "$fd"
 	xx="$1" && shift 1
-	$xmsg "$@" 2>/dev/null | sort 1>"$fd" 2>/dev/null || \
-	    err "!find $(echo "$@") > \"$fd\""
+	"$@" 2>/dev/null | sort 1>"$fd" 2>/dev/null || err "FATAL: !sort fx_"
 	dx_ "$xx" "$fd" || break
 	x_ rm -f "$fd"
 }

include/rom.sh

@@ -183,7 +183,7 @@ mkseagrub()
 	[ "$payload_grubsea" = "y" ] && pname="grub"
 	[ "$payload_grubsea" = "y" ] || \
 	    cbfs "$tmprom" "$grubdata/bootorder" bootorder raw
-	fe_ cprom find "$grubdata/keymap" -type f -name "*.gkb"
+	fx_ cprom x_ find "$grubdata/keymap" -type f -name "*.gkb"
 }
 
 add_uboot()

mk

@@ -88,7 +88,7 @@ build_release()
 	x_ ./mk -d coreboot
 	mk -b coreboot pico-serprog stm32-vserprog pcsx-redux
 
-	fe_ mkrom_tarball find bin -maxdepth 1 -type d -name "serprog_*"
+	fx_ mkrom_tarball x_ find bin -maxdepth 1 -type d -name "serprog_*"
 	x_ mv bin ../roms
 	) || err "can't build rom images"