Fix bug adding locales with missing open quotes and fix locale names to underscore...

diff --git a/GenaSYS.sh b/GenaSYS.sh
index b298d79..88ee6a9 100755 (executable)
--- a/GenaSYS.sh
+++ b/GenaSYS.sh
@@ -25,8 +25,8 @@
     PURPOSE_="Generate config files needed for Evergreen-ILS Cluster"
    SYNOPSIS_="$NAME_"
    REQUIRES_="standard GNU commands, apt, dpkg"
-    VERSION_="1.84"
-       DATE_="2010-11-23; last update: 2017-09-01"
+    VERSION_="1.85"
+       DATE_="2010-11-23; last update: 2017-09-02"
      AUTHOR_="Andy Witter <awitter@georgialibraries.org>"
         URL_="http://evergreen-ils.org"
    CATEGORY_="devel"
@@ -277,8 +277,8 @@ echo -e "If you plan on using the SIP servers in the cluster then copy"
 echo -e "a preconfigured" ${COL_BR_GREEN}oils_sip.xml${COL_RESET} "to the"${COL_YELLOW} "${CUSTOMDIR}" ${COL_RESET} directory.
 sleep 0.1
 echo
-echo -e ${COL_BR_CYAN}"7 __SIP Custom Locale Support:"${COL_RESET}
-echo -e "If you are using custom locales then please copy the files"
+echo -e ${COL_BR_CYAN}"7 __SIP Customized Locale Support:"${COL_RESET}
+echo -e "If you are using customized locales then please copy the files"
 echo -e "ending in .po into the${COL_YELLOW} "${CUSTOMDIR}" ${COL_RESET} directory. eg. es-ES.po."
 sleep 3
 echo

diff --git a/templates/setup-head.sh b/templates/setup-head.sh
index 9581f67..a925339 100755 (executable)
--- a/templates/setup-head.sh
+++ b/templates/setup-head.sh
@@ -159,7 +159,7 @@ then
         echo "Setting up custom locales..."
         for LOCALE_FILE in $LOCALE_DIR/*
         do
-               LOCALE="$(echo $LOCALE_FILE | awk -F"/" '{ print $7 }' | awk -F"." '{ print $1 }' | tr '[:upper:]' '[:lower:]')"
+               LOCALE="$(echo $LOCALE_FILE | awk -F"/" '{ print $7 }' | awk -F"." '{ print $1 }' | tr '[:upper:]' '[:lower:]' | tr '-' '_')"
                 if grep "$LOCALE_FILE" $EG_VHOST | grep -qv '#'
                 then
                         sleep 1
@@ -172,7 +172,7 @@ then
                         echo
                         echo "Found $LOCALE_FILE Locale for this file is: $LOCALE"
                         sed -i "/#PerlAddVar OILSWebLocale \"\/openils\/var\/data\/locale\/opac\/fr-CA.po\"/a \     \PerlAddVar OILSWebLocale \"${LOCALE_FILE}\"" "$EG_VHOST"
-                        sed -i "/#PerlAddVar OILSWebLocale \"\/openils\/var\/data\/locale\/opac\/fr-CA.po\"/a \     \PerlAddVar OILSWebLocale ${LOCALE}\"" "$EG_VHOST"
+                        sed -i "/#PerlAddVar OILSWebLocale \"\/openils\/var\/data\/locale\/opac\/fr-CA.po\"/a \     \PerlAddVar OILSWebLocale \"${LOCALE}\"" "$EG_VHOST"
                 fi
         done
         echo