casa-mp-base

--- a/bin/install-catalog.in    2012-09-04 16:37:48.000000000 -0700

+++ b/bin/install-catalog.in    2012-09-04 16:37:56.000000000 -0700

@@ -13,6 +13,9 @@

 \040 -h, --help: \t\t\t\t Print this help message and exit\n\

 \040 -v, --version: \t\t\t Print the version number and exit\n"

+# We need the files we create to be world readable

+umask 022

+

 # Set version message

 SGML_VERSION_MESSAGE="sgml-common version @VERSION@ (install-catalog version 1.0)"

@@ -36,8 +39,8 @@

 # Process actions

 case $1 in

    -a|--add)    SGML_ACTION="addition"

-       SGML_CENTRALIZED=$2

-       SGML_ORDINARY=$3

+       SGML_CENTRALIZED="$2"

+       SGML_ORDINARY="$3"

        ;;

    -r|--remove)    if [ -z "$3" -o "$3" = "--version" ]

        then

@@ -45,8 +48,8 @@

          exit 0

        fi

            SGML_ACTION="removal"

-       SGML_CENTRALIZED=$2

-       SGML_ORDINARY=$3

+       SGML_CENTRALIZED="$2"

+       SGML_ORDINARY="$3"

        ;;

    -h|--help)  echo -e $SGML_HELP_MESSAGE

        exit 0

@@ -93,14 +96,14 @@

 fi

 case $SGML_ACTION in

    addition)

-   if [ -e $SGML_CENTRALIZED -a ! -w $SGML_CENTRALIZED ]

+   if [ -e "$SGML_CENTRALIZED" -a ! -w "$SGML_CENTRALIZED" ]

    then

      echo "`basename $0`: can not modify \"$SGML_CENTRALIZED\"." >&2

      exit 2

    fi

    ;;

    removal)

-   if [ ! -w $SGML_CENTRALIZED ]

+   if [ ! -w "$SGML_CENTRALIZED" ]

    then

      echo "`basename $0`: can not modify \"$SGML_CENTRALIZED\"." >&2

      exit 2

@@ -116,7 +119,7 @@

 fi

 case $SGML_ACTION in

    addition)

-   if [ ! -s $SGML_ORDINARY ]

+   if [ ! -s "$SGML_ORDINARY" ]

    then

      echo "`basename $0`: \"$SGML_ORDINARY\" does not exist or is empty." >&2

      exit 2

@@ -128,33 +131,33 @@

 case $SGML_ACTION in

     addition)

    echo "`basename $0`: addition of $SGML_ORDINARY in $SGML_CENTRALIZED"

-   if grep -q $SGML_ORDINARY $SGML_CENTRALIZED 2>/dev/null

+   if grep -q "$SGML_ORDINARY" "$SGML_CENTRALIZED" 2>/dev/null

    then

      echo "Warning: $SGML_ORDINARY is already installed in the centralized catalog $SGML_CENTRALIZED" >&2

    else

-     echo "$SGML_POINTER $SGML_ORDINARY" >> $SGML_CENTRALIZED

+     echo "$SGML_POINTER \"$SGML_ORDINARY\"" >> "$SGML_CENTRALIZED"

    fi

-   grep -q $SGML_CENTRALIZED /etc/sgml/catalog 2>/dev/null

+   grep -q "$SGML_CENTRALIZED" /etc/sgml/catalog 2>/dev/null

    if [ $? -ne 0 ]

    then

      echo "`basename $0`: addition of $SGML_CENTRALIZED in /etc/sgml/catalog"

-     echo "$SGML_POINTER $SGML_CENTRALIZED" >> /etc/sgml/catalog

+     echo "$SGML_POINTER \"$SGML_CENTRALIZED\"" >> /etc/sgml/catalog

    fi

    ;;

    removal)

    echo "`basename $0`: removal of $SGML_ORDINARY from $SGML_CENTRALIZED"

-   if grep -q $SGML_ORDINARY $SGML_CENTRALIZED 2>/dev/null

+   if grep -q "$SGML_ORDINARY" "$SGML_CENTRALIZED" 2>/dev/null

    then

-          sed -e "\:$SGML_POINTER $SGML_ORDINARY:d" < $SGML_CENTRALIZED > ${SGML_CENTRALIZED}.new

-          mv ${SGML_CENTRALIZED}.new $SGML_CENTRALIZED

+          sed -e "\:$SGML_POINTER \"\\?$SGML_ORDINARY\"\\?:d" < "$SGML_CENTRALIZED" > "${SGML_CENTRALIZED}.new"

+          mv "${SGML_CENTRALIZED}.new" "$SGML_CENTRALIZED"

    else