Versión 1.0: carga bien el ficheros de idiomas cuando la variable {{{$LANG}}} incluye referencia a moneda.

git-svn-id: https://opengnsys.es/svn/branches/version1.0@1702 a21b9725-9963-47de-94b9-378ad31fedc9

1 files changed, 7 insertions, 10 deletions

diff --git a/client/shared/etc/preinit/loadenviron.sh b/client/shared/etc/preinit/loadenviron.sh
index 83b9b9a9..c3dae813 100755
--- a/client/shared/etc/preinit/loadenviron.sh
+++ b/client/shared/etc/preinit/loadenviron.sh
@@ -23,18 +23,16 @@ if [ -d $OPENGNSYS ]; then
     export OGCAC=$OPENGNSYS/cache
     export OGLOG=$OPENGNSYS/log
 
-	export PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin:/opt/og2fs/2ndfs/opt/drbl/sbin
+    export PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin:/opt/og2fs/2ndfs/opt/drbl/sbin
     export PATH=$OGSCRIPTS:$PATH:$OGAPI:$OGBIN
    
-    GLOBAL="cat /proc/cmdline"
-	for i in `${GLOBAL}`
-	do
-		echo $i | grep "=" > /dev/null && export $i
-	done
+    # Exportar parámetros del kernel.
+    for i in $(cat /proc/cmdline); do
+        echo $i | grep -q "=" && export $i
+    done
    
-
     # Cargar fichero de idioma.
-    LANGFILE=$OGETC/lang.$LANG.conf
+    LANGFILE=$OGETC/lang.${LANG%@*}.conf
     if [ -f $LANGFILE ]; then
 	source $LANGFILE
 	for i in $(awk -F= '{if (NF==2) print $1}' $LANGFILE); do
@@ -59,7 +57,7 @@ if [ -d $OPENGNSYS ]; then
     if [ -n "$ogengine" ]
     then
     	for i in $OGAPI/*.$ogengine; do
-        	[ -f $i ] && source $i 
+            [ -f $i ] && source $i 
     	done
     fi
    
@@ -80,4 +78,3 @@ export OG_ERR_IMAGE=5		# Error al crear o restaurar una imagen.
 export OG_ERR_NOTOS=6		# Sin sistema operativo.
 export OG_ERR_NOTEXEC=7		# Programa o función no ejecutable.
 
-