From fe69b8403e9a74b4cc084ae7f1657928333051a1 Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Sun, 27 Dec 2009 17:36:18 +0000
Subject: [PATCH] cleanup script; no functional change

---
 xwords4/wince/scripts/check_ids.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/xwords4/wince/scripts/check_ids.sh b/xwords4/wince/scripts/check_ids.sh
index 03fc95247..a29f08f25 100755
--- a/xwords4/wince/scripts/check_ids.sh
+++ b/xwords4/wince/scripts/check_ids.sh
@@ -3,34 +3,36 @@
 ID_FILE=${ID_FILE:-./strids.h}
 
 if [ ! -f $ID_FILE ]; then
-    echo "$ID_FILE not found"
+    echo "$0: $ID_FILE not found"
     exit 0;
 elif [ -z "$1" ]; then
     echo "usage: <rc file> [<rc file>*]"
 fi
 
 while [ -n "$1" ]; do
+    RC_FILE=$1
     cat $ID_FILE | grep '^# *define.* IDS' \
         | sed 's/^# *define *\(IDS_.*\) .*$/\1/' \
         | while read ID; do
-        COUNT=$(grep -w -c $ID $1)
+        COUNT=$(grep -w -c $ID $RC_FILE)
         if [ 0 -eq "$COUNT" ]; then
-            echo $ID not found in $1
+            echo $ID not found in $RC_FILE
         elif [ 1 -lt "$COUNT" ]; then
-            echo "$ID found $COUNT times in $1"
+            echo "$ID found $COUNT times in $RC_FILE"
         fi
         if ! grep -q $ID *.c; then
             echo $ID not used in any .c file
         fi
     done
 
-    grep '^\s*IDS_.*' $1 | sed 's/^ *\(IDS[A-Z_]*\).*$/\1/' | sort -u > /tmp/ids_cur$$.txt
+    grep '^\s*IDS_.*' "$RC_FILE" | sed 's/^ *\(IDS[A-Z_]*\).*$/\1/' | \
+        sort -u > /tmp/ids_cur$$.txt
     if [ -e /tmp/ids_prev$$.txt ]; then
-        echo -e "\ncomparing IDs in $1, $PREV"
+        echo -e "\ncomparing IDs in $RC_FILE, $PREV"
         diff /tmp/ids_prev$$.txt /tmp/ids_cur$$.txt
     fi
     mv /tmp/ids_cur$$.txt /tmp/ids_prev$$.txt
-    PREV=$1
+    PREV=$RC_FILE
 
     shift
 done