Set local environment variables to C so mk_cmds and compile_et always work

Addresses SourceForge Bug: #1532177

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/lib/et/ChangeLog b/lib/et/ChangeLog
index 71dfbdf4718726ceb75e7ab743cdc85251d4efe9..a43245cf7c12a2e06db7cf85a3de72aeb5f17f91 100644 (file)
--- a/lib/et/ChangeLog
+++ b/lib/et/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-12  Theodore Tso  <tytso@mit.edu>
+
+       * compile_et.sh.in: Make sure locale environment variables are set to
+               C so the shell script executes consistently no matter the
+               locale setting.  (Addresses SourceForge Bug: #1532177)
+
 2006-10-22  Theodore Tso  <tytso@mit.edu>
 
        * compile_et.sh.in: Add datarootdir definition for compatibility

diff --git a/lib/et/compile_et.sh.in b/lib/et/compile_et.sh.in
index c81ea1f6bad2f5de58674449f20282c14539f284..96772c78da67c2a6cdd95645cde8eb6f431109b4 100644 (file)
--- a/lib/et/compile_et.sh.in
+++ b/lib/et/compile_et.sh.in
@@ -17,6 +17,18 @@ if test "x$1" = x ; then
     exit 1
 fi
 
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    $as_unset $as_var
+  fi
+done
+
 if test ! -f "$DIR/et_h.awk" || test ! -f "$DIR/et_c.awk" ; then
     DIR="$ET_DIR"
 #    echo "Falling back to $DIR..."

diff --git a/lib/ss/ChangeLog b/lib/ss/ChangeLog
index 08b1f708f481ec0ace30f2fb7960f2ef4a5bc171..bc72dee2ff516c608261f8863444402d71142644 100644 (file)
--- a/lib/ss/ChangeLog
+++ b/lib/ss/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-12  Theodore Tso  <tytso@mit.edu>
+
+       * mk_cmds.sh.in: Make sure locale environment variables are set to
+               C so the shell script executes consistently no matter the
+               locale setting.  (Addresses SourceForge Bug: #1532177)
+
 2006-10-22  Theodore Tso  <tytso@mit.edu>
 
        * mk_cmds.sh.in: Add datarootdir definition for compatibility with

diff --git a/lib/ss/mk_cmds.sh.in b/lib/ss/mk_cmds.sh.in
index b9a4417704703ea46a4ecf9d266c50063bcd1b80..f2b46a6866c3ab6acb9989d3460b3c96f91a4c42 100644 (file)
--- a/lib/ss/mk_cmds.sh.in
+++ b/lib/ss/mk_cmds.sh.in
@@ -8,6 +8,18 @@ SS_DIR="@SS_DIR@"
 AWK=@AWK@
 SED=@SED@
 
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    $as_unset $as_var
+  fi
+done
+
 if test "x$1" = x ; then
     echo "Usage: mk_cmds file"
     exit 1