|
1 # Existing set of patches from the desktop gate |
|
2 # Not suitable for upstream |
|
3 |
|
4 --- sgml-common-0.6.3/bin/install-catalog.in.quotes Mon Nov 5 11:19:23 2001 |
|
5 +++ sgml-common-0.6.3/bin/install-catalog.in Mon Nov 5 11:20:12 2001 |
|
6 @@ -39,8 +39,8 @@ |
|
7 # Process actions |
|
8 case $1 in |
|
9 -a|--add) SGML_ACTION="addition" |
|
10 - SGML_CENTRALIZED=$2 |
|
11 - SGML_ORDINARY=$3 |
|
12 + SGML_CENTRALIZED="$2" |
|
13 + SGML_ORDINARY="$3" |
|
14 ;; |
|
15 -r|--remove) if [ -z "$3" -o "$3" = "--version" ] |
|
16 then |
|
17 @@ -48,8 +48,8 @@ |
|
18 exit 0 |
|
19 fi |
|
20 SGML_ACTION="removal" |
|
21 - SGML_CENTRALIZED=$2 |
|
22 - SGML_ORDINARY=$3 |
|
23 + SGML_CENTRALIZED="$2" |
|
24 + SGML_ORDINARY="$3" |
|
25 ;; |
|
26 -h|--help) echo -e $SGML_HELP_MESSAGE |
|
27 exit 0 |
|
28 @@ -96,14 +96,14 @@ |
|
29 fi |
|
30 case $SGML_ACTION in |
|
31 addition) |
|
32 - if [ -e $SGML_CENTRALIZED -a ! -w $SGML_CENTRALIZED ] |
|
33 + if [ -e "$SGML_CENTRALIZED" -a ! -w "$SGML_CENTRALIZED" ] |
|
34 then |
|
35 echo "`basename $0`: can not modify \"$SGML_CENTRALIZED\"." >&2 |
|
36 exit 2 |
|
37 fi |
|
38 ;; |
|
39 removal) |
|
40 - if [ ! -w $SGML_CENTRALIZED ] |
|
41 + if [ ! -w "$SGML_CENTRALIZED" ] |
|
42 then |
|
43 echo "`basename $0`: can not modify \"$SGML_CENTRALIZED\"." >&2 |
|
44 exit 2 |
|
45 @@ -119,7 +119,7 @@ |
|
46 fi |
|
47 case $SGML_ACTION in |
|
48 addition) |
|
49 - if [ ! -s $SGML_ORDINARY ] |
|
50 + if [ ! -s "$SGML_ORDINARY" ] |
|
51 then |
|
52 echo "`basename $0`: \"$SGML_ORDINARY\" does not exist or is empty." >&2 |
|
53 exit 2 |
|
54 @@ -131,33 +131,33 @@ |
|
55 case $SGML_ACTION in |
|
56 addition) |
|
57 echo "`basename $0`: addition of $SGML_ORDINARY in $SGML_CENTRALIZED" |
|
58 - if grep -q $SGML_ORDINARY $SGML_CENTRALIZED 2>/dev/null |
|
59 + if grep -q "$SGML_ORDINARY" "$SGML_CENTRALIZED" 2>/dev/null |
|
60 then |
|
61 echo "Warning: $SGML_ORDINARY is already installed in the centralized catalog $SGML_CENTRALIZED" >&2 |
|
62 else |
|
63 - echo "$SGML_POINTER $SGML_ORDINARY" >> $SGML_CENTRALIZED |
|
64 + echo "$SGML_POINTER \"$SGML_ORDINARY\"" >> "$SGML_CENTRALIZED" |
|
65 fi |
|
66 - grep -q $SGML_CENTRALIZED /etc/sgml/catalog 2>/dev/null |
|
67 + grep -q "$SGML_CENTRALIZED" /etc/sgml/catalog 2>/dev/null |
|
68 if [ $? -ne 0 ] |
|
69 then |
|
70 echo "`basename $0`: addition of $SGML_CENTRALIZED in /etc/sgml/catalog" |
|
71 - echo "$SGML_POINTER $SGML_CENTRALIZED" >> /etc/sgml/catalog |
|
72 + echo "$SGML_POINTER \"$SGML_CENTRALIZED\"" >> /etc/sgml/catalog |
|
73 fi |
|
74 ;; |
|
75 removal) |
|
76 echo "`basename $0`: removal of $SGML_ORDINARY from $SGML_CENTRALIZED" |
|
77 - if grep -q $SGML_ORDINARY $SGML_CENTRALIZED 2>/dev/null |
|
78 + if grep -q "$SGML_ORDINARY" "$SGML_CENTRALIZED" 2>/dev/null |
|
79 then |
|
80 - sed -e "\:$SGML_POINTER $SGML_ORDINARY:d" < $SGML_CENTRALIZED > ${SGML_CENTRALIZED}.new |
|
81 - mv ${SGML_CENTRALIZED}.new $SGML_CENTRALIZED |
|
82 + sed -e "\:$SGML_POINTER \"\\?$SGML_ORDINARY\"\\?:d" < "$SGML_CENTRALIZED" > "${SGML_CENTRALIZED}.new" |
|
83 + mv "${SGML_CENTRALIZED}.new" "$SGML_CENTRALIZED" |
|
84 else |
|
85 echo "Warning: $SGML_ORDINARY was not found in the centralized catalog $SGML_CENTRALIZED" >&2 |
|
86 fi |
|
87 - if [ ! -s $SGML_CENTRALIZED ] |
|
88 + if [ ! -s "$SGML_CENTRALIZED" ] |
|
89 then |
|
90 - rm $SGML_CENTRALIZED |
|
91 + rm "$SGML_CENTRALIZED" |
|
92 echo "`basename $0`: removal of $SGML_CENTRALIZED from /etc/sgml/catalog" |
|
93 - sed -e "\:$SGML_POINTER $SGML_CENTRALIZED:d" < /etc/sgml/catalog > /etc/sgml/catalog.new |
|
94 + sed -e "\:$SGML_POINTER \"\\?$SGML_CENTRALIZED\"\\?:d" < /etc/sgml/catalog > /etc/sgml/catalog.new |
|
95 mv /etc/sgml/catalog.new /etc/sgml/catalog |
|
96 fi |
|
97 ;; |