From 5cf40d1248ebc99e76906c59df0ae6fb58e96843 Mon Sep 17 00:00:00 2001 From: Syer10 Date: Sun, 25 Sep 2022 18:54:25 -0400 Subject: [PATCH] Fix NamingFix.sh for preview builds --- .github/workflows/Preview.yml | 2 +- scripts/NamingFix.sh | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/Preview.yml b/.github/workflows/Preview.yml index 71109d62..327c4995 100644 --- a/.github/workflows/Preview.yml +++ b/.github/workflows/Preview.yml @@ -153,7 +153,7 @@ jobs: run: ./scripts/DebDependencyFix.sh - name: Fix filenames - run: ./scripts/NamingFix.sh + run: ./scripts/NamingFix.sh preview - name: Get previous release id: last_release diff --git a/scripts/NamingFix.sh b/scripts/NamingFix.sh index 9cc9ad76..95fe14d4 100755 --- a/scripts/NamingFix.sh +++ b/scripts/NamingFix.sh @@ -1,12 +1,18 @@ #!/bin/bash +if [[ "$*" == *"preview"* ]]; then + name="Tachidesk-JUI-Preview" +else + name="Tachidesk-JUI" +fi + msi="$(find ./ -iname '*.msi' 2>/dev/null)" if [ -f "$msi" ]; then dir="$(dirname "$msi")" version=$(tmp="${msi%.*}" && echo "${tmp##*-}") - if [ "$(basename "$msi")" != "Tachidesk-JUI-windows-x64-$version.msi" ]; then - mv "$msi" "$dir/Tachidesk-JUI-windows-x64-$version.msi" + if [ "$(basename "$msi")" != "$name-windows-x64-$version.msi" ]; then + mv "$msi" "$dir/$name-windows-x64-$version.msi" fi fi @@ -15,8 +21,8 @@ if [ -f "$dmg" ]; then dir="$(dirname "$dmg")" version=$(tmp="${dmg%.*}" && echo "${tmp##*-}") - if [ "$(basename "$dmg")" != "Tachidesk-JUI-macos-x64-$version.dmg" ]; then - mv "$dmg" "$dir/Tachidesk-JUI-macos-x64-$version.dmg" + if [ "$(basename "$dmg")" != "$name-macos-x64-$version.dmg" ]; then + mv "$dmg" "$dir/$name-macos-x64-$version.dmg" fi fi @@ -24,7 +30,7 @@ apk="$(find ./ -iname '*.apk' 2>/dev/null)" if [ -f "$apk" ]; then dir="$(dirname "$apk")" - if [ "$(basename "$apk")" != "Tachidesk-JUI-android.apk" ]; then - mv "$apk" "$dir/Tachidesk-JUI-android.apk" + if [ "$(basename "$apk")" != "$name-android.apk" ]; then + mv "$apk" "$dir/$name-android.apk" fi fi