From 0d24875ee63322476f06659f56c69560c1e042d8 Mon Sep 17 00:00:00 2001 From: chris1111 Date: Fri, 13 Sep 2024 20:05:34 -0400 Subject: [PATCH] Fix Clover Package --- .github/workflows/main.yml | 2 +- CloverPackage/Makefile | 10 ++++------ CloverPackage/makepkg | 2 +- CloverPackage/package/translate.sh | 10 +++++----- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f44555cb2..d6914f4ce 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,7 +39,7 @@ jobs: - name: Upload to Artifacts uses: actions/upload-artifact@v4 with: - name: Clover beta-${{ env.GIT_SHA }} + name: Clover-GCC-14.1.0-${{ env.GIT_SHA }} path: | *.7z CloverV2*.zip diff --git a/CloverPackage/Makefile b/CloverPackage/Makefile index 92bf156ff..7143cdb82 100644 --- a/CloverPackage/Makefile +++ b/CloverPackage/Makefile @@ -22,8 +22,8 @@ slimpkg2: slimpkg3: @${SRCROOT}/makepkg --nothemes --norc --nolegacy -#updatepo: -# @${SRCROOT}/package/translate.sh --update-po +updatepo: + @${SRCROOT}/package/translate.sh --update-po utils: @make -C "${SRCROOT}"/utils all @@ -32,8 +32,6 @@ install: @make -C "${SRCROOT}"/utils install clean: - rm -rf sym obj dst -#CloverPrefpane/build CloverUpdater/build - -.PHONY: clean image iso pkg installer utils + rm -rf sym obj dst CloverPrefpane/build CloverUpdater/build +.PHONY: clean image iso pkg installer updatepo utils diff --git a/CloverPackage/makepkg b/CloverPackage/makepkg index d782a6661..a9cceeff3 100755 --- a/CloverPackage/makepkg +++ b/CloverPackage/makepkg @@ -56,7 +56,7 @@ echo "${revision}" > revision # Make the translation echo "" echo "========= Translating Resources ========" -#./package/translate.sh || exit $? +./package/translate.sh || exit $? # Check that XCode is install properly xcode_path=$(/usr/bin/xcode-select --print-path 2>/dev/null) diff --git a/CloverPackage/package/translate.sh b/CloverPackage/package/translate.sh index c0cfc7869..9fced977a 100755 --- a/CloverPackage/package/translate.sh +++ b/CloverPackage/package/translate.sh @@ -58,17 +58,17 @@ while [[ $# -gt 0 ]]; do done TEMPLATES_DIR="Resources/templates" -#CLOVER_UPDATER_DIR="../CloverUpdater" -#CLOVER_PREFPANE_DIR="../CloverPrefpane" +CLOVER_UPDATER_DIR="../CloverUpdater" +CLOVER_PREFPANE_DIR="../CloverPrefpane" PODIR="po" # Update CloverUpdater.strings -#"$CLOVER_UPDATER_DIR"/translate_xib.sh --extract-only +"$CLOVER_UPDATER_DIR"/translate_xib.sh --extract-only # Update CloverPrefpane.strings -#"$CLOVER_PREFPANE_DIR"/translate_xib.sh --extract-only +"$CLOVER_PREFPANE_DIR"/translate_xib.sh --extract-only # Update Localizable.strings -#"$CLOVER_PREFPANE_DIR"/translate_source.sh --extract-only +"$CLOVER_PREFPANE_DIR"/translate_source.sh --extract-only # Check if pot and po files need to be updated IFS=$'\n' # '