fix select_language

bin/manjaro-architect.in

@@ -28,7 +28,7 @@ import ${LIBDIR}/util-disk.sh
 [[ $1 == "-d" ]] && declare -i debug=1
 
 id_system
-[[ $(cat /tmp/.language 2>/dev/null) == "" ]] && select_language
+select_language
 mk_connection
 check_requirements
 greeting

lib/util.sh

@@ -181,19 +181,21 @@ check_for_error() {
 
 # Add locale on-the-fly and sets source translation file for installer
 select_language() {
-    DIALOG " Select Language " --default-item '3' --menu "\n$_Lang" 0 0 11 \
+    if [[ $(cat ${LANGSEL} 2>/dev/null) == "" ]]; then
-      "1" $"Danish|(da_DK)" \
+        DIALOG " Select Language " --default-item '3' --menu "\n$_Lang" 0 0 11 \
-      "2" $"Dutch|(nl_NL)" \
+          "1" $"Danish|(da_DK)" \
-      "3" $"English|(en_**)" \
+          "2" $"Dutch|(nl_NL)" \
-      "4" $"French|(fr_FR)" \
+          "3" $"English|(en_**)" \
-      "5" $"Hungarian|(hu_HU)" \
+          "4" $"French|(fr_FR)" \
-      "6" $"Italian|(it_IT)" \
+          "5" $"Hungarian|(hu_HU)" \
-      "7" $"Portuguese|(pt_PT)" \
+          "6" $"Italian|(it_IT)" \
-      "8" $"Portuguese [Brasil]|(pt_BR)" \
+          "7" $"Portuguese|(pt_PT)" \
-      "9" $"Russian|(ru_RU)" \
+          "8" $"Portuguese [Brasil]|(pt_BR)" \
-      "10" $"Spanish|(es_ES)" 2>${LANGSEL}
+          "9" $"Russian|(ru_RU)" \
-
+          "10" $"Spanish|(es_ES)" 2>${LANGSEL}
-#      "5" $"German|(de_DE)" \
+
+#          "5" $"German|(de_DE)" \
+    fi
 
     case $(cat ${LANGSEL}) in
         "1") source $DATADIR/translations/danish.trans
@@ -248,19 +250,21 @@ select_language() {
               ;;
     esac
 
-    # Generate the chosen locale and set the language
+    if [[ $(cat ${LANGSEL} 2>/dev/null) == "" ]]; then
-    DIALOG " $_Config " --infobox "$_ApplySet" 0 0
+        # Generate the chosen locale and set the language
-    sleep 2
+        DIALOG " $_Config " --infobox "$_ApplySet" 0 0
-    sed -i "s/#${CURR_LOCALE}/${CURR_LOCALE}/" /etc/locale.gen
+        sleep 2
-    locale-gen >/dev/null 2>$ERR
+        sed -i "s/#${CURR_LOCALE}/${CURR_LOCALE}/" /etc/locale.gen
-    export LANG=${CURR_LOCALE}
+        locale-gen >/dev/null 2>$ERR
+        export LANG=${CURR_LOCALE}
 
-    check_for_error "set LANG=${CURR_LOCALE}" $?
+        check_for_error "set LANG=${CURR_LOCALE}" $?
 
-    [[ $FONT != "" ]] && {
+        [[ $FONT != "" ]] && {
-        setfont $FONT 2>$ERR
+            setfont $FONT 2>$ERR
-        check_for_error "set font $FONT" $?
+            check_for_error "set font $FONT" $?
-    }
+        }
+    fi
 }
 
 mk_connection() {