|
 |
bb6756 |
--- sgml-common-0.6.3/bin/install-catalog.in.quotes Mon Nov 5 11:19:23 2001
|
|
|
bb6756 |
+++ sgml-common-0.6.3/bin/install-catalog.in Mon Nov 5 11:20:12 2001
|
|
|
bb6756 |
@@ -39,8 +39,8 @@
|
|
|
bb6756 |
# Process actions
|
|
|
bb6756 |
case $1 in
|
|
|
bb6756 |
-a|--add) SGML_ACTION="addition"
|
|
|
bb6756 |
- SGML_CENTRALIZED=$2
|
|
|
bb6756 |
- SGML_ORDINARY=$3
|
|
|
bb6756 |
+ SGML_CENTRALIZED="$2"
|
|
|
bb6756 |
+ SGML_ORDINARY="$3"
|
|
|
bb6756 |
;;
|
|
|
bb6756 |
-r|--remove) if [ -z "$3" -o "$3" = "--version" ]
|
|
|
bb6756 |
then
|
|
|
bb6756 |
@@ -48,8 +48,8 @@
|
|
|
bb6756 |
exit 0
|
|
|
bb6756 |
fi
|
|
|
bb6756 |
SGML_ACTION="removal"
|
|
|
bb6756 |
- SGML_CENTRALIZED=$2
|
|
|
bb6756 |
- SGML_ORDINARY=$3
|
|
|
bb6756 |
+ SGML_CENTRALIZED="$2"
|
|
|
bb6756 |
+ SGML_ORDINARY="$3"
|
|
|
bb6756 |
;;
|
|
|
bb6756 |
-h|--help) echo -e $SGML_HELP_MESSAGE
|
|
|
bb6756 |
exit 0
|
|
|
bb6756 |
@@ -96,14 +96,14 @@
|
|
|
bb6756 |
fi
|
|
|
bb6756 |
case $SGML_ACTION in
|
|
|
bb6756 |
addition)
|
|
|
bb6756 |
- if [ -e $SGML_CENTRALIZED -a ! -w $SGML_CENTRALIZED ]
|
|
|
bb6756 |
+ if [ -e "$SGML_CENTRALIZED" -a ! -w "$SGML_CENTRALIZED" ]
|
|
|
bb6756 |
then
|
|
|
bb6756 |
echo "`basename $0`: can not modify \"$SGML_CENTRALIZED\"." >&2
|
|
|
bb6756 |
exit 2
|
|
|
bb6756 |
fi
|
|
|
bb6756 |
;;
|
|
|
bb6756 |
removal)
|
|
|
bb6756 |
- if [ ! -w $SGML_CENTRALIZED ]
|
|
|
bb6756 |
+ if [ ! -w "$SGML_CENTRALIZED" ]
|
|
|
bb6756 |
then
|
|
|
bb6756 |
echo "`basename $0`: can not modify \"$SGML_CENTRALIZED\"." >&2
|
|
|
bb6756 |
exit 2
|
|
|
bb6756 |
@@ -119,7 +119,7 @@
|
|
|
bb6756 |
fi
|
|
|
bb6756 |
case $SGML_ACTION in
|
|
|
bb6756 |
addition)
|
|
|
bb6756 |
- if [ ! -s $SGML_ORDINARY ]
|
|
|
bb6756 |
+ if [ ! -s "$SGML_ORDINARY" ]
|
|
|
bb6756 |
then
|
|
|
bb6756 |
echo "`basename $0`: \"$SGML_ORDINARY\" does not exist or is empty." >&2
|
|
|
bb6756 |
exit 2
|
|
|
bb6756 |
@@ -131,33 +131,33 @@
|
|
|
bb6756 |
case $SGML_ACTION in
|
|
|
bb6756 |
addition)
|
|
|
bb6756 |
echo "`basename $0`: addition of $SGML_ORDINARY in $SGML_CENTRALIZED"
|
|
|
bb6756 |
- if grep -q $SGML_ORDINARY $SGML_CENTRALIZED 2>/dev/null
|
|
|
bb6756 |
+ if grep -q "$SGML_ORDINARY" "$SGML_CENTRALIZED" 2>/dev/null
|
|
|
bb6756 |
then
|
|
|
bb6756 |
echo "Warning: $SGML_ORDINARY is already installed in the centralized catalog $SGML_CENTRALIZED" >&2
|
|
|
bb6756 |
else
|
|
|
bb6756 |
- echo "$SGML_POINTER $SGML_ORDINARY" >> $SGML_CENTRALIZED
|
|
|
bb6756 |
+ echo "$SGML_POINTER \"$SGML_ORDINARY\"" >> "$SGML_CENTRALIZED"
|
|
|
bb6756 |
fi
|
|
|
bb6756 |
- grep -q $SGML_CENTRALIZED /etc/sgml/catalog 2>/dev/null
|
|
|
bb6756 |
+ grep -q "$SGML_CENTRALIZED" /etc/sgml/catalog 2>/dev/null
|
|
|
bb6756 |
if [ $? -ne 0 ]
|
|
|
bb6756 |
then
|
|
|
bb6756 |
echo "`basename $0`: addition of $SGML_CENTRALIZED in /etc/sgml/catalog"
|
|
|
bb6756 |
- echo "$SGML_POINTER $SGML_CENTRALIZED" >> /etc/sgml/catalog
|
|
|
bb6756 |
+ echo "$SGML_POINTER \"$SGML_CENTRALIZED\"" >> /etc/sgml/catalog
|
|
|
bb6756 |
fi
|
|
|
bb6756 |
;;
|
|
|
bb6756 |
removal)
|
|
|
bb6756 |
echo "`basename $0`: removal of $SGML_ORDINARY from $SGML_CENTRALIZED"
|
|
|
bb6756 |
- if grep -q $SGML_ORDINARY $SGML_CENTRALIZED 2>/dev/null
|
|
|
bb6756 |
+ if grep -q "$SGML_ORDINARY" "$SGML_CENTRALIZED" 2>/dev/null
|
|
|
bb6756 |
then
|
|
|
bb6756 |
- sed -e "\:$SGML_POINTER $SGML_ORDINARY:d" < $SGML_CENTRALIZED > ${SGML_CENTRALIZED}.new
|
|
|
bb6756 |
- mv ${SGML_CENTRALIZED}.new $SGML_CENTRALIZED
|
|
|
bb6756 |
+ sed -e "\:$SGML_POINTER \"\\?$SGML_ORDINARY\"\\?:d" < "$SGML_CENTRALIZED" > "${SGML_CENTRALIZED}.new"
|
|
|
bb6756 |
+ mv "${SGML_CENTRALIZED}.new" "$SGML_CENTRALIZED"
|
|
|
bb6756 |
else
|
|
|
bb6756 |
echo "Warning: $SGML_ORDINARY was not found in the centralized catalog $SGML_CENTRALIZED" >&2
|
|
|
bb6756 |
fi
|
|
|
bb6756 |
- if [ ! -s $SGML_CENTRALIZED ]
|
|
|
bb6756 |
+ if [ ! -s "$SGML_CENTRALIZED" ]
|
|
|
bb6756 |
then
|
|
|
bb6756 |
- rm $SGML_CENTRALIZED
|
|
|
bb6756 |
+ rm "$SGML_CENTRALIZED"
|
|
|
bb6756 |
echo "`basename $0`: removal of $SGML_CENTRALIZED from /etc/sgml/catalog"
|
|
|
bb6756 |
- sed -e "\:$SGML_POINTER $SGML_CENTRALIZED:d" < /etc/sgml/catalog > /etc/sgml/catalog.new
|
|
|
bb6756 |
+ sed -e "\:$SGML_POINTER \"\\?$SGML_CENTRALIZED\"\\?:d" < /etc/sgml/catalog > /etc/sgml/catalog.new
|
|
|
bb6756 |
mv /etc/sgml/catalog.new /etc/sgml/catalog
|
|
|
bb6756 |
fi
|
|
|
bb6756 |
;;
|