From 1b54c7a744ac474bdcf0844ace97741b949a6fa1 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 6 Oct 2025 12:43:04 +0100 Subject: rom.sh: use if_dry_build macro instead of checking if_not_dry_build. use it here the same way. yes. shell script macros. it's how i roll. Signed-off-by: Leah Rowe --- include/rom.sh | 6 ++---- include/tree.sh | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/rom.sh b/include/rom.sh index b1c3c559..67723559 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -25,9 +25,8 @@ buildser() copyps1bios() { - if [ "$if_not_dry_build" = ":" ]; then + $if_dry_build \ return 0 - fi remkdir "bin/playstation" x_ cp src/pcsx-redux/src/mips/openbios/openbios.bin bin/playstation @@ -45,9 +44,8 @@ mkpayload_grub() grub_modules="" grub_install_modules="" - if [ "$if_not_dry_build" = ":" ]; then + $if_dry_build \ return 0 - fi . "$grubdata/module/$tree" || \ err "Can't read '$grubdata/module/$tree'" "mkpayload_grub" "$@" diff --git a/include/tree.sh b/include/tree.sh index 19060110..7b5d57b5 100644 --- a/include/tree.sh +++ b/include/tree.sh @@ -35,6 +35,7 @@ cmakedir="" defconfig="" postmake="" mkhelpercfg="" +if_dry_build=":" if_not_dry_build="" dest_dir="" mdir="" @@ -73,6 +74,7 @@ trees() # and $if_not_dry_build is prefixed to skipped commands if_not_dry_build=":" + if_dry_build="" ;; -b) : ;; -u) mode="oldconfig" ;; @@ -82,10 +84,12 @@ trees() -f) # download source code for a project do_make="n" # lets us know not to build anything if_not_dry_build=":" + if_dry_build="" ;; -F) # same as -F, but don't skip git fetch/pull on cache do_make="n" # lets us know not to build anything if_not_dry_build=":" + if_dry_build="" forcepull="y" ;; -s) mode="savedefconfig" ;; -- cgit v1.2.1