Final package script update

xchellx · Dec 17, 2024 · 9a296d2 · 9a296d2
1 parent 1c921c3
commit 9a296d2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/package.sh b/package.sh
@@ -20,8 +20,8 @@ if [ -d "$dp0/build" ] ; then
         cp -f -R "$dp0/licenses/." "$dp0/build/package/txtrtool/licenses"
         cp -f -R "$dp0/extern/gxtexture_base/licenses/." "$dp0/build/package/txtrtool/licenses"
         VERSION="$(git describe --exact-match --tags 2> /dev/null)"
-        [ $? -ne 0 ] && [ -z "$(git status --porcelain 2> /dev/null)" ] && VERSION="$(git rev-parse --short HEAD 2> /dev/null)" || VERSION="$(git rev-parse --short HEAD 2> /dev/null)-dirty"
-        [ $? -ne 0 ] && VERSION="unknown"
+        [ -z "${VERSION}" ] && [ -z "$(git status --porcelain 2> /dev/null)" ] && VERSION="$(git rev-parse --short HEAD 2> /dev/null)" || VERSION="$(git rev-parse --short HEAD 2> /dev/null)-dirty"
+        [ -z "${VERSION}" ] && VERSION="unknown"
         7za a -ssw -t7z -mx=9 -myx=9 -ms=off -mmt=16 -mmtf=on -mtm=off -mtc=off -mta=off -m0=LZMA2:d=256m:mf=bt4:lc=4:fb=256 "$dp0/build/txtrtool_${VERSION}_msys2-clang64_win-x64.7z" "$dp0/build/package/txtrtool/"
         return 0 2>/dev/null
         exit 0