Windows: Fix including unofficial language in installer (#2326)

* Windows: Fix including unofficial language in installer Fixes #2313 * Windows: Add BOM to copyq.iss * Windows: Update installer icon
hluk · Apr 16, 2023 · e4d0b34 · e4d0b34
1 parent c4e4813
commit e4d0b34
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/shared/copyq.iss b/shared/copyq.iss
@@ -1,4 +1,4 @@
-; 1. Open this file with Inno Setup with Unicode support and preprocessor.
+; 1. Open this file with Inno Setup with Unicode support and preprocessor.
 ; 2. Change "#defines" below (or see below how to use COPYQ_INNO_SETUP environment variable).
 ; 3. Compile "setup.exe".
 
@@ -53,7 +53,7 @@ Name: cz; MessagesFile: "compiler:Languages\Czech.isl"
 Name: de; MessagesFile: "compiler:Languages\German.isl"
 Name: es; MessagesFile: "compiler:Languages\Spanish.isl"
 Name: it; MessagesFile: "compiler:Languages\Italian.isl"
-Name: ko; MessagesFile: "{#Output}\Korean.isl"
+Name: ko; MessagesFile: "Languages\Korean.isl"
 
 [CustomMessages]
 en.ProgramFiles=Program Files

diff --git a/shared/logo-small.bmp b/shared/logo-small.bmp
diff --git a/utils/appveyor/before_build.sh b/utils/appveyor/before_build.sh
@@ -4,8 +4,12 @@ set -exo pipefail
 # shellcheck disable=SC1091
 source utils/appveyor/env.sh
 
-curl --remote-name-all --output-dir "$APPVEYOR_BUILD_FOLDER/Shared" \
+languages=$APPVEYOR_BUILD_FOLDER/Shared/Languages
+mkdir -p "$languages"
+curl --location --silent --show-error --fail-with-body \
+    --remote-name-all --output-dir "$languages" \
     https://github.com/jrsoftware/issrc/raw/main/Files/Languages/Unofficial/Korean.isl
+grep -q LanguageName "$languages/Korean.isl"
 
 if [[ $WITH_NATIVE_NOTIFICATIONS == ON ]]; then
     build=$APPVEYOR_BUILD_FOLDER/utils/appveyor/kf5_build.sh