Make x86_64 image more similar to Pi image if installer is used. Improve RHVoice fixes so they shouldn't be stale any more.

pi4/build/build-stormux.sh

@@ -121,14 +121,28 @@ finish_build() {
     exit 0
 }
 
-copy_rhvoice_english_fixes() {
-    local sourceDir="../files/etc/RHVoice/dicts/English"
+install_rhvoice_english_fixes() {
+    local rhvoiceRepo="https://git.stormux.org/storm/rhvoice-english"
     local targetDir="/mnt/etc/RHVoice/dicts/English"
+    local tempDir
+    local installStatus=0
 
-    if [[ -d "$sourceDir" ]]; then
-        mkdir -p "$targetDir"
-        cp -a "$sourceDir/." "$targetDir/"
+    tempDir="$(mktemp -d)"
+
+    echo "Installing latest RHVoice English dictionary fixes..."
+    if ! git clone --depth 1 "$rhvoiceRepo" "$tempDir"; then
+        rm -rf "$tempDir"
+        return 1
     fi
+
+    mkdir -p "$targetDir"
+    rm -f "$targetDir/namefix.txt" "$targetDir/wordfix.txt"
+    if ! cp -a "$tempDir/English/." "$targetDir/"; then
+        installStatus=1
+    fi
+
+    rm -rf "$tempDir"
+    return "$installStatus"
 }
 
 # shellcheck disable=SC2329 # install_sas is emitted into the chroot heredoc with declare -f
@@ -549,7 +563,7 @@ sed -i '/^DisableSandbox/d' /etc/pacman.conf
 
 EOF
 
-copy_rhvoice_english_fixes
+install_rhvoice_english_fixes
 
 # Copy skel files to stormux user home (after user rename in chroot)
 find ../files/etc/skel/ -mindepth 1 -exec cp -rv "{}" /mnt/home/stormux/ \;