mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-11 05:52:36 +02:00
do not handle errors on mktemp in shell scripts
errors are not defined for mktemp, and the /tmp file system should be assumed reliable. if /tmp is *unreliable*, then this is not something that lbmk either can or should fix; the user clearly has bigger problems. manpages for mktemp do not define errors. it is assumed to be completely reliable. Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
+2
-3
@@ -24,10 +24,9 @@ scan_config()
|
||||
awkstr=" /\{.*${1}.*}{/ {flag=1;next} /\}/{flag=0} flag { print }"
|
||||
confdir="${2}"
|
||||
_fail="${3}"
|
||||
revfile="$(mktemp -t sources.XXXXXXXXXX)" || \
|
||||
"${_fail}" "scan_config: Cannot initialise tmpfile"
|
||||
revfile="$(mktemp -t sources.XXXXXXXXXX)"
|
||||
cat "${confdir}/"* > "${revfile}" || \
|
||||
"${_fail}" "scan_config: Cannot concatenate files"
|
||||
"${_fail}" "scan_config ${confdir}: Cannot concatenate files"
|
||||
while read -r line ; do
|
||||
set ${line} 1>/dev/null 2>/dev/null || :
|
||||
if [ "${1%:}" = "depend" ]; then
|
||||
|
||||
@@ -263,8 +263,7 @@ build_grub_roms()
|
||||
-n background.png -t raw
|
||||
fi
|
||||
|
||||
tmpcfg=$(mktemp -t coreboot_rom.XXXXXXXXXX) ||
|
||||
err "build_grub_roms: cannot create temporary scan.cfg"
|
||||
tmpcfg=$(mktemp -t coreboot_rom.XXXXXXXXXX)
|
||||
x_ printf "set grub_scan_disk=\"%s\"\n" "${grub_scan_disk}" >"${tmpcfg}"
|
||||
[ "${grub_scan_disk}" = "both" ] || \
|
||||
x_ "${cbfstool}" "${tmprom}" add -f "${tmpcfg}" -n scan.cfg -t raw
|
||||
@@ -302,8 +301,7 @@ mkGrubRom() {
|
||||
|
||||
keymapcfg="elf/grub/keymap_${_keymap}.cfg"
|
||||
|
||||
tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX) || \
|
||||
err "mkGrubRom: cannot create tmprom"
|
||||
tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX)
|
||||
x_ cp "${_cbrom}" "${tmprom}"
|
||||
x_ "${cbfstool}" "${tmprom}" add -f "${keymapcfg}" -n keymap.cfg -t raw
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ export LOCALVERSION="-${projectname}-${our_version}"
|
||||
eval "$(setvars "" arch cfgsdir codedir config config_name crossgcc_ada mode \
|
||||
elfdir listfile project romtype target target_dir targets tree cbfstool)"
|
||||
|
||||
tmpclean="$(mktemp -d -t makeclean.XXXXXXXXXX)" || fail "!mkdir tmpclean"
|
||||
tmpclean="$(mktemp -d -t makeclean.XXXXXXXXXX)"
|
||||
|
||||
main()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user