[Lunar-commits] r26128 - moonbase/branches/crater/libs/glibc-new

[Jannis Pohlmann]

Author: jannis
Date: 2007-10-08 21:54:46 +0200 (Mon, 08 Oct 2007)
New Revision: 26128

Modified:
   moonbase/branches/crater/libs/glibc-new/CONFIGURE
Log:
Use the unmodified lines from localedata/SUPPORTED. We'll probably split them up in BUILD.

Modified: moonbase/branches/crater/libs/glibc-new/CONFIGURE
===================================================================
--- moonbase/branches/crater/libs/glibc-new/CONFIGURE	2007-10-08 18:42:16 UTC (rev 26127)
+++ moonbase/branches/crater/libs/glibc-new/CONFIGURE	2007-10-08 19:54:46 UTC (rev 26128)
@@ -29,21 +29,22 @@
   # supported variables in the $SUPPORTED_LOCALES variable
   . $COPIED_SUPPORTED &&
   
-  # For each locale, extract name, title and encoding information
-  for line in $SUPPORTED_LOCALES; do
-    locale=$(echo $line | sed -e 's:\/.*$::g')
+  # For each locale, extract name, title and charmap information
+  for locale in $SUPPORTED_LOCALES; do
+    locale_base=$(echo $locale | sed -e 's:\/.*$::g;s:\..*$::g')
 
     # This is a bit tricky and slow but it does the job
-    if [[ -e $LOCALEDATA_DIR/locales/${locale/.*/} ]]; then
-      title=$(cat $LOCALEDATA_DIR/locales/${locale/.*/} | grep ^title)
+    if [[ -e $LOCALEDATA_DIR/locales/$locale_base ]]; then
+      title=$(cat $LOCALEDATA_DIR/locales/$locale_base | grep ^title)
       title=$(echo $title | awk -F"\"" '{ $1 = ""; print }')
       title=$(echo $title | sed -e 's/^[ \t]*//;s/[ \t]*$//')
     else
       title=""
     fi
-    # Echo locale/encoding, title and status to be passed to the 
+
+    # Echo locale/charmap, title and status to be passed to the 
     # dialog checklist
-    echo "\"$line\" \"$title\" \"off\" "
+    echo "\"$locale\" \"$title\" \"off\" "
   done
 }