e2fsck: merge dirs_to_hash when threads finish

[tools/e2fsprogs.git] / lib / ss / mk_cmds.sh.in

diff --git a/lib/ss/mk_cmds.sh.in b/lib/ss/mk_cmds.sh.in
index 303a73a..53282f4 100644 (file)
--- a/lib/ss/mk_cmds.sh.in
+++ b/lib/ss/mk_cmds.sh.in
@@ -2,10 +2,21 @@
 #
 #
 
-DIR="${DIR-@datadir@/ss}"
-SS_DIR="@SS_DIR@"
+DIR=@datadir@/ss
 AWK=@AWK@
-SED=@SED@
+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"
@@ -17,12 +28,8 @@ if test -n "$_SS_DIR_OVERRIDE" ; then
 fi
 
 if test ! -f $DIR/ct_c.sed || test ! -f $DIR/ct_c.awk ; then
-    DIR="$SS_DIR"
-#    echo "Falling back to $DIR..."
-    if test ! -f "$DIR/ct_c.sed" || test ! -f "$DIR/ct_c.awk" ; then
-       echo "mk_cmds: Couldn't find mk_cmds's template files."
-       exit 1
-    fi
+    echo "mk_cmds: Couldn't find mk_cmds's template files."
+    exit 1
 fi
 
 FILE="$1"
@@ -31,7 +38,7 @@ BASE=`basename "$ROOT"`
 TMP="ct$$.c"
 
 if test ! -f "$FILE" ; then
-    echo "$FILE: File not found"
+    echo "mk_cmds: $FILE: File not found"
     exit 1;
 fi
 
@@ -43,6 +50,7 @@ if grep "^#__ERROR_IN_FILE" "${TMP}" > /dev/null; then
        exit 1
 else
        rm -f "${BASE}.c"
-       mv "${TMP}" "${BASE}.c"
+       mv -f "${TMP}" "${BASE}.c"
+       chmod a-w "${BASE}.c"
        exit 0
 fi