mirrors/UEFITool
1
0
Fork 0
mirror of https://github.com/LongSoft/UEFITool.git synced 2025-05-09 13:52:01 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix an issue with kaitai_regenerate.sh creating backup files on modern macOS

Browse source
This commit is contained in:
Nikolaj Schlej 2025-02-14 04:58:59 +01:00
parent fd76e896cc
commit 0af36bdcd9
2 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
kaitai_regenerate.sh Executable file → Normal file
View file

@ -7,12 +7,10 @@ if [ "$UTARGET" = "Darwin" ]; then
export UPLATFORM="mac"
export UFIND="find -E"
export UFINDOPT=""
export USEDOPT="''"
elif [ "$UTARGET" = "Linux" ]; then
export UPLATFORM="linux_$(uname -m)"
export UFIND="find"
export UFINDOPT="-regextype posix-extended"
export USEDOPT=""
else
export UPLATFORM="$UTARGET"
echo "Please run this script on Linux or macOS"
@ -30,26 +28,31 @@ ${UFIND} common/generated ${UFINDOPT} \
# Replace global includes for kaitai with local ones (<> -> "")
${UFIND} common/generated ${UFINDOPT} \
-regex '.*\.(cpp|h)' \
-exec sed -i ${USEDOPT} '/^#include <kaitai/s/[<>]/\"/g' {} + || exit 1
-exec sed -i.bak '/^#include <kaitai/s/[<>]/\"/g' {} + || exit 1
# Add .. to the include path for kaitai includes
${UFIND} common/generated ${UFINDOPT} \
-regex '.*\.(cpp|h)' \
-exec sed -i ${USEDOPT} '/^#include \"kaitai\//s/kaitai\//..\/kaitai\//g' {} + || exit 1
-exec sed -i.bak '/^#include \"kaitai\//s/kaitai\//..\/kaitai\//g' {} + || exit 1
# Suppress "p__root - unused parameter" warning
${UFIND} common/generated ${UFINDOPT} \
-regex '.*\.(cpp)' \
-exec sed -i ${USEDOPT} '/^ m__root = this;/s/;/; (void)p__root;/g' {} + || exit 1
-exec sed -i.bak '/^ m__root = this;/s/;/; (void)p__root;/g' {} + || exit 1
# Add uint64_t to enum structure_ids_t
${UFIND} common/generated ${UFINDOPT} \
-regex '.*\.(h)' \
-exec sed -i ${USEDOPT} '/^ enum structure_ids_t {/s/{/: uint64_t {/g' {} + || exit 1
-exec sed -i.bak '/^ enum structure_ids_t {/s/{/: uint64_t {/g' {} + || exit 1
# Suppress type downcast warning in ami_nvar.cpp
${UFIND} common/generated ${UFINDOPT} \
-name 'ami_nvar.cpp' \
-exec sed -i ${USEDOPT} 's/_offset = _io()->pos();/_offset = (int32_t)_io()->pos();/g' {} + || exit 1
-exec sed -i.bak 's/_offset = _io()->pos();/_offset = (int32_t)_io()->pos();/g' {} + || exit 1
# Remove backup files
${UFIND} common/generated ${UFINDOPT} \
-regex '.*\.(bak)' \
-exec rm {} + || exit 1
exit 0