[FIX] Fixed issue when generating locales

nuxsmin · Jul 19, 2018 · 82a370b · 82a370b
1 parent ad512a6
commit 82a370b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/sysPass-dev-php7/entrypoint.sh b/sysPass-dev-php7/entrypoint.sh
@@ -34,6 +34,7 @@ setup_composer () {
     echo -e "${COLOR_YELLOW}setup_composer: Updating${COLOR_NC}"
 
     run_composer update
+    popd
     return 0
   fi
 
@@ -62,6 +63,7 @@ setup_locales() {
     echo -e "\n### sysPass locales" >> $LOCALE_GEN
     echo "es_ES.UTF-8 UTF-8" >> $LOCALE_GEN
     echo "en_US.UTF-8 UTF-8" >> $LOCALE_GEN
+    echo "en_GB.UTF-8 UTF-8" >> $LOCALE_GEN
     echo "de_DE.UTF-8 UTF-8" >> $LOCALE_GEN
     echo "ca_ES.UTF-8 UTF-8" >> $LOCALE_GEN
     echo "fr_FR.UTF-8 UTF-8" >> $LOCALE_GEN
@@ -72,12 +74,15 @@ setup_locales() {
     echo 'LANG="en_US.UTF-8"' > /etc/default/locale
 
     dpkg-reconfigure --frontend=noninteractive locales
+
     update-locale LANG=en_US.UTF-8
 
-    LANG=en_US.UTF-8
+    export LANG=en_US.UTF-8
 
     echo "1" > .setup
- fi
+  else
+    echo -e "${COLOR_YELLOW}setup_locales: Locales already set up${COLOR_NC}"
+  fi
 }
 
 setup_apache () {

diff --git a/sysPass-dev/entrypoint.sh b/sysPass-dev/entrypoint.sh
@@ -34,6 +34,7 @@ setup_composer () {
     echo -e "${COLOR_YELLOW}setup_composer: Updating${COLOR_NC}"
 
     run_composer update
+    popd
     return 0
   fi
 
@@ -62,6 +63,7 @@ setup_locales() {
     echo -e "\n### sysPass locales" >> $LOCALE_GEN
     echo "es_ES.UTF-8 UTF-8" >> $LOCALE_GEN
     echo "en_US.UTF-8 UTF-8" >> $LOCALE_GEN
+    echo "en_GB.UTF-8 UTF-8" >> $LOCALE_GEN
     echo "de_DE.UTF-8 UTF-8" >> $LOCALE_GEN
     echo "ca_ES.UTF-8 UTF-8" >> $LOCALE_GEN
     echo "fr_FR.UTF-8 UTF-8" >> $LOCALE_GEN
@@ -72,12 +74,15 @@ setup_locales() {
     echo 'LANG="en_US.UTF-8"' > /etc/default/locale
 
     dpkg-reconfigure --frontend=noninteractive locales
+
     update-locale LANG=en_US.UTF-8
 
-    LANG=en_US.UTF-8
+    export LANG=en_US.UTF-8
 
     echo "1" > .setup
- fi
+  else
+    echo -e "${COLOR_YELLOW}setup_locales: Locales already set up${COLOR_NC}"
+  fi
 }
 
 setup_apache () {