Rev 7 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 7 | Rev 14 | ||
---|---|---|---|
Line 5... | Line 5... | ||
5 | ## DP: with kill -s SIGNAL and trap "final" 0 2 15 with trap "final" |
5 | ## DP: with kill -s SIGNAL and trap "final" 0 2 15 with trap "final" |
6 | ## DP: 0 INT TERM. |
6 | ## DP: 0 INT TERM. |
7 | 7 | ||
8 | @DPATCH@ |
8 | @DPATCH@ |
9 | diff -urNad trunk~/scripts/ssvnc trunk/scripts/ssvnc |
9 | diff -urNad trunk~/scripts/ssvnc trunk/scripts/ssvnc |
10 | --- trunk~/scripts/ssvnc 2009-10-25 15:15:48.000000000 +0100 |
10 | --- trunk~/scripts/ssvnc 2010-02-01 00:19:05.000000000 +0100 |
11 | +++ trunk/scripts/ssvnc 2009-10-31 17:08:05.000000000 +0100 |
11 | +++ trunk/scripts/ssvnc 2010-02-01 00:19:06.000000000 +0100 |
12 | @@ -124,7 +124,7 @@ |
12 | @@ -169,7 +169,7 @@ |
13 | WISH=wish |
13 | WISH=wish |
14 | for try in wish8.4 wish wish8.3 wish8.5 wish8.6 |
14 | for try in wish8.4 wish wish8.3 wish8.5 wish8.6 |
15 | do |
15 | do |
16 | - if type $try > /dev/null; then |
16 | - if type $try > /dev/null 2>&1; then |
17 | + if which $try > /dev/null; then |
17 | + if which $try > /dev/null 2>&1; then |
18 | WISH=$try |
18 | WISH=$try |
19 | break |
19 | break |
20 | fi |
20 | fi |
21 | @@ -185,13 +185,13 @@ |
21 | @@ -230,13 +230,13 @@ |
22 | PATH=$PATH:/usr/sbin:/usr/local/sbin:/dist/sbin |
22 | PATH=$PATH:/usr/sbin:/usr/local/sbin:/dist/sbin |
23 | 23 | ||
24 | quit=0 |
24 | quit=0 |
25 | - if type vncviewer >/dev/null 2>/dev/null; then |
25 | - if type vncviewer >/dev/null 2>/dev/null; then |
26 | + if which vncviewer >/dev/null 2>/dev/null; then |
26 | + if which vncviewer >/dev/null 2>/dev/null; then |
Line 33... | Line 33... | ||
33 | + if which stunnel >/dev/null 2>/dev/null; then |
33 | + if which stunnel >/dev/null 2>/dev/null; then |
34 | : |
34 | : |
35 | else |
35 | else |
36 | echo "stunnel not found in PATH." |
36 | echo "stunnel not found in PATH." |
37 | diff -urNad trunk~/scripts/ssvnc_cmd trunk/scripts/ssvnc_cmd |
37 | diff -urNad trunk~/scripts/ssvnc_cmd trunk/scripts/ssvnc_cmd |
38 | --- trunk~/scripts/ssvnc_cmd 2009-10-25 15:15:42.000000000 +0100 |
38 | --- trunk~/scripts/ssvnc_cmd 2009-11-26 21:02:11.000000000 +0100 |
39 | +++ trunk/scripts/ssvnc_cmd 2009-10-31 17:08:05.000000000 +0100 |
39 | +++ trunk/scripts/ssvnc_cmd 2010-02-01 00:19:06.000000000 +0100 |
40 | @@ -181,13 +181,13 @@ |
40 | @@ -184,13 +184,13 @@ |
41 | PATH=$PATH:/usr/sbin:/usr/local/sbin:/dist/sbin |
41 | PATH=$PATH:/usr/sbin:/usr/local/sbin:/dist/sbin |
42 | 42 | ||
43 | quit=0 |
43 | quit=0 |
44 | - if type vncviewer >/dev/null 2>/dev/null; then |
44 | - if type vncviewer >/dev/null 2>/dev/null; then |
45 | + if which vncviewer >/dev/null 2>/dev/null; then |
45 | + if which vncviewer >/dev/null 2>/dev/null; then |
Line 51... | Line 51... | ||
51 | - if type stunnel >/dev/null 2>/dev/null; then |
51 | - if type stunnel >/dev/null 2>/dev/null; then |
52 | + if which stunnel >/dev/null 2>/dev/null; then |
52 | + if which stunnel >/dev/null 2>/dev/null; then |
53 | : |
53 | : |
54 | else |
54 | else |
55 | echo "stunnel not found in PATH." |
55 | echo "stunnel not found in PATH." |
56 | @@ -254,7 +254,7 @@ |
56 | @@ -266,7 +266,7 @@ |
57 | if echo "$VNCVIEWERCMD" | grep '\.turbovnc' > /dev/null; then |
57 | if echo "$VNCVIEWERCMD" | grep '\.turbovnc' > /dev/null; then |
58 | : |
58 | : |
59 | else |
59 | else |
60 | - if type "$VNCVIEWERCMD.turbovnc" > /dev/null 2>/dev/null; then |
60 | - if type "$VNCVIEWERCMD.turbovnc" > /dev/null 2>/dev/null; then |
61 | + if which "$VNCVIEWERCMD.turbovnc" > /dev/null 2>/dev/null; then |
61 | + if which "$VNCVIEWERCMD.turbovnc" > /dev/null 2>/dev/null; then |
62 | VNCVIEWERCMD="$VNCVIEWERCMD.turbovnc" |
62 | VNCVIEWERCMD="$VNCVIEWERCMD.turbovnc" |
63 | fi |
63 | fi |
64 | fi |
64 | fi |
65 | diff -urNad trunk~/scripts/util/ss_vncviewer trunk/scripts/util/ss_vncviewer |
65 | diff -urNad trunk~/scripts/util/ss_vncviewer trunk/scripts/util/ss_vncviewer |
66 | --- trunk~/scripts/util/ss_vncviewer 2009-10-28 15:21:49.000000000 +0100 |
66 | --- trunk~/scripts/util/ss_vncviewer 2009-11-18 05:34:33.000000000 +0100 |
67 | +++ trunk/scripts/util/ss_vncviewer 2009-10-31 17:22:43.000000000 +0100 |
67 | +++ trunk/scripts/util/ss_vncviewer 2010-02-01 00:19:06.000000000 +0100 |
68 | @@ -119,7 +119,7 @@ |
68 | @@ -135,7 +135,7 @@ |
69 | if echo "$VNCVIEWERCMD" | grep '\.turbovnc' > /dev/null; then |
69 | if echo "$VNCVIEWERCMD" | grep '\.turbovnc' > /dev/null; then |
70 | : |
70 | : |
71 | else |
71 | else |
72 | - if type "$VNCVIEWERCMD.turbovnc" > /dev/null 2>/dev/null; then |
72 | - if type "$VNCVIEWERCMD.turbovnc" > /dev/null 2>/dev/null; then |
73 | + if which "$VNCVIEWERCMD.turbovnc" > /dev/null 2>/dev/null; then |
73 | + if which "$VNCVIEWERCMD.turbovnc" > /dev/null 2>/dev/null; then |
74 | VNCVIEWERCMD="$VNCVIEWERCMD.turbovnc" |
74 | VNCVIEWERCMD="$VNCVIEWERCMD.turbovnc" |
75 | fi |
75 | fi |
76 | fi |
76 | fi |
77 | @@ -146,7 +146,7 @@ |
77 | @@ -162,7 +162,7 @@ |
78 | check_stunnel=1 |
78 | check_stunnel=1 |
79 | if [ "X$SSVNC_BASEDIRNAME" != "X" ]; then |
79 | if [ "X$SSVNC_BASEDIRNAME" != "X" ]; then |
80 | if [ -x "$SSVNC_BASEDIRNAME/stunnel" ]; then |
80 | if [ -x "$SSVNC_BASEDIRNAME/stunnel" ]; then |
81 | - type stunnel > /dev/null 2>&1 |
81 | - type stunnel > /dev/null 2>&1 |
82 | + which stunnel > /dev/null 2>&1 |
82 | + which stunnel > /dev/null 2>&1 |
83 | if [ $? = 0 ]; then |
83 | if [ $? = 0 ]; then |
84 | # found ours |
84 | # found ours |
85 | STUNNEL=stunnel |
85 | STUNNEL=stunnel |
86 | @@ -155,7 +155,7 @@ |
86 | @@ -171,7 +171,7 @@ |
87 | fi |
87 | fi |
88 | fi |
88 | fi |
89 | if [ "X$check_stunnel" = "X1" ]; then |
89 | if [ "X$check_stunnel" = "X1" ]; then |
90 | - type stunnel4 > /dev/null 2>&1 |
90 | - type stunnel4 > /dev/null 2>&1 |
91 | + which stunnel4 > /dev/null 2>&1 |
91 | + which stunnel4 > /dev/null 2>&1 |
92 | if [ $? = 0 ]; then |
92 | if [ $? = 0 ]; then |
93 | STUNNEL=stunnel4 |
93 | STUNNEL=stunnel4 |
94 | else |
94 | else |
95 | @@ -395,7 +395,7 @@ |
95 | @@ -411,7 +411,7 @@ |
96 | # a portable, but not absolutely safe, tmp file creator |
96 | # a portable, but not absolutely safe, tmp file creator |
97 | mytmp() { |
97 | mytmp() { |
98 | tf=$1 |
98 | tf=$1 |
99 | - if type mktemp > /dev/null 2>&1; then |
99 | - if type mktemp > /dev/null 2>&1; then |
100 | + if which mktemp > /dev/null 2>&1; then |
100 | + if which mktemp > /dev/null 2>&1; then |
101 | # if we have mktemp(1), use it: |
101 | # if we have mktemp(1), use it: |
102 | tf2="$tf.XXXXXX" |
102 | tf2="$tf.XXXXXX" |
103 | tf2=`mktemp "$tf2"` |
103 | tf2=`mktemp "$tf2"` |
104 | @@ -640,33 +640,33 @@ |
104 | @@ -656,33 +656,33 @@ |
105 | fi |
105 | fi |
106 | if [ "X$pssh" != "X" ]; then |
106 | if [ "X$pssh" != "X" ]; then |
107 | echo "Terminating background ssh process" |
107 | echo "Terminating background ssh process" |
108 | - echo kill -TERM "$pssh" |
108 | - echo kill -TERM "$pssh" |
109 | - kill -TERM "$pssh" 2>/dev/null |
109 | - kill -TERM "$pssh" 2>/dev/null |
Line 144... | Line 144... | ||
144 | - kill -TERM $tail_pid2 |
144 | - kill -TERM $tail_pid2 |
145 | + kill -s TERM $tail_pid2 |
145 | + kill -s TERM $tail_pid2 |
146 | fi |
146 | fi |
147 | } |
147 | } |
148 | 148 | ||
149 | @@ -721,7 +721,7 @@ |
149 | @@ -737,7 +737,7 @@ |
150 | 150 | ||
151 | # trick for the undocumented rsh://host:port method. |
151 | # trick for the undocumented rsh://host:port method. |
152 | rsh_viewer() { |
152 | rsh_viewer() { |
153 | - trap "final" 0 2 15 |
153 | - trap "final" 0 2 15 |
154 | + trap "final" 0 INT TERM |
154 | + trap "final" 0 INT TERM |
155 | if [ "X$PORT" = "X" ]; then |
155 | if [ "X$PORT" = "X" ]; then |
156 | exit 1 |
156 | exit 1 |
157 | elif [ $PORT -ge 5900 ]; then |
157 | elif [ $PORT -ge 5900 ]; then |
158 | @@ -740,7 +740,7 @@ |
158 | @@ -756,7 +756,7 @@ |
159 | } |
159 | } |
160 | 160 | ||
161 | check_perl() { |
161 | check_perl() { |
162 | - if type "$1" > /dev/null 2>&1; then |
162 | - if type "$1" > /dev/null 2>&1; then |
163 | + if which "$1" > /dev/null 2>&1; then |
163 | + if which "$1" > /dev/null 2>&1; then |
164 | : |
164 | : |
165 | elif [ ! -x "$1" ]; then |
165 | elif [ ! -x "$1" ]; then |
166 | echo "" |
166 | echo "" |
167 | @@ -2036,7 +2036,7 @@ |
167 | @@ -2083,7 +2083,7 @@ |
168 | if [ "X$sshword" != "X" ]; then |
168 | if [ "X$sshword" != "X" ]; then |
169 | if [ -x "$sshword" ]; then |
169 | if [ -x "$sshword" ]; then |
170 | : |
170 | : |
171 | - elif type "$sshword" > /dev/null 2>&1; then |
171 | - elif type "$sshword" > /dev/null 2>&1; then |
172 | + elif which "$sshword" > /dev/null 2>&1; then |
172 | + elif which "$sshword" > /dev/null 2>&1; then |
173 | : |
173 | : |
174 | else |
174 | else |
175 | echo "" |
175 | echo "" |
176 | @@ -2343,7 +2343,7 @@ |
176 | @@ -2421,7 +2421,7 @@ |
177 | 177 | ||
178 | stty sane |
178 | stty sane |
179 | i=0 |
179 | i=0 |
180 | - if type perl > /dev/null 2>&1; then |
180 | - if type perl > /dev/null 2>&1; then |
181 | + if which perl > /dev/null 2>&1; then |
181 | + if which perl > /dev/null 2>&1; then |
182 | imax=50 |
182 | imax=50 |
183 | sleepit="perl -e 'select(undef, undef, undef, 0.20)'" |
183 | sleepit="perl -e 'select(undef, undef, undef, 0.20)'" |
184 | else |
184 | else |
185 | @@ -2458,7 +2458,7 @@ |
185 | @@ -2536,7 +2536,7 @@ |
186 | if [ "X$use_sshssl" = "X" -a "X$getport" = "X" ]; then |
186 | if [ "X$use_sshssl" = "X" -a "X$getport" = "X" ]; then |
187 | echo "Running viewer:" |
187 | echo "Running viewer:" |
188 | 188 | ||
189 | - trap "final" 0 2 15 |
189 | - trap "final" 0 2 15 |
190 | + trap "final" 0 INT TERM |
190 | + trap "final" 0 INT TERM |
191 | if [ "X$reverse" = "X" ]; then |
191 | if [ "X$reverse" = "X" ]; then |
192 | echo "$VNCVIEWERCMD" "$@" $localhost:$N |
192 | echo "$VNCVIEWERCMD" "$@" $localhost:$N |
193 | echo "" |
193 | echo "" |
194 | @@ -2515,7 +2515,7 @@ |
194 | @@ -2593,7 +2593,7 @@ |
195 | fi |
195 | fi |
196 | 196 | ||
197 | if [ "X$stunnel_set_here" = "X1" -a "X$showcert" = "X" ]; then |
197 | if [ "X$stunnel_set_here" = "X1" -a "X$showcert" = "X" ]; then |
198 | - if type $STUNNEL > /dev/null 2>&1; then |
198 | - if type $STUNNEL > /dev/null 2>&1; then |
199 | + if which $STUNNEL > /dev/null 2>&1; then |
199 | + if which $STUNNEL > /dev/null 2>&1; then |
200 | : |
200 | : |
201 | else |
201 | else |
202 | echo "" |
202 | echo "" |
203 | @@ -2624,7 +2624,7 @@ |
203 | @@ -2705,7 +2705,7 @@ |
204 | if [ "X$ciphers" != "X" ]; then |
204 | if [ "X$ciphers" != "X" ]; then |
205 | cipher_args=`echo "$ciphers" | sed -e 's/ciphers=/-cipher /'` |
205 | cipher_args=`echo "$ciphers" | sed -e 's/ciphers=/-cipher /'` |
206 | fi |
206 | fi |
207 | - if type openssl > /dev/null 2>&1; then |
207 | - if type openssl > /dev/null 2>&1; then |
208 | + if which openssl > /dev/null 2>&1; then |
208 | + if which openssl > /dev/null 2>&1; then |
209 | : |
209 | : |
210 | else |
210 | else |
211 | echo "" |
211 | echo "" |
212 | @@ -2735,7 +2735,7 @@ |
212 | @@ -2825,7 +2825,7 @@ |
213 | if [ "X$getport" = "X" ]; then |
213 | if [ "X$getport" = "X" ]; then |
214 | sleep 1 |
214 | sleep 1 |
215 | fi |
215 | fi |
216 | - elif type printf > /dev/null 2>&1; then |
216 | - elif type printf > /dev/null 2>&1; then |
217 | + elif which printf > /dev/null 2>&1; then |
217 | + elif which printf > /dev/null 2>&1; then |
218 | printf "Are you sure you want to continue? [y]/n " |
218 | printf "Are you sure you want to continue? [y]/n " |
219 | read x |
219 | read x |
220 | else |
220 | else |
221 | @@ -2798,7 +2798,7 @@ |
221 | @@ -2888,7 +2888,7 @@ |
222 | fi |
222 | fi |
223 | hostdisp2=`echo "$hostdisp" | sed -e 's/pw=[^ ]*/pw=******/g'` |
223 | hostdisp2=`echo "$hostdisp" | sed -e 's/pw=[^ ]*/pw=******/g'` |
224 | echo "$VNCVIEWERCMD" "$@" "$hostdisp2" |
224 | echo "$VNCVIEWERCMD" "$@" "$hostdisp2" |
225 | - trap "final" 0 2 15 |
225 | - trap "final" 0 2 15 |
226 | + trap "final" 0 INT TERM |
226 | + trap "final" 0 INT TERM |
227 | echo "" |
227 | echo "" |
228 | $VNCVIEWERCMD "$@" "$hostdisp" |
228 | $VNCVIEWERCMD "$@" "$hostdisp" |
229 | if [ $? != 0 ]; then |
229 | if [ $? != 0 ]; then |
230 | @@ -2812,7 +2812,7 @@ |
230 | @@ -2902,7 +2902,7 @@ |
231 | echo "" |
231 | echo "" |
232 | echo "NOTE: Press Ctrl-C to terminate viewer LISTEN mode." |
232 | echo "NOTE: Press Ctrl-C to terminate viewer LISTEN mode." |
233 | echo "" |
233 | echo "" |
234 | - trap "final" 0 2 15 |
234 | - trap "final" 0 2 15 |
235 | + trap "final" 0 INT TERM |
235 | + trap "final" 0 INT TERM |
236 | if [ "X$SSVNC_ULTRA_DSM" != "X" ]; then |
236 | if [ "X$SSVNC_ULTRA_DSM" != "X" ]; then |
237 | echo "NOTE: The ultravnc_dsm_helper only runs once. So after the first LISTEN" |
237 | echo "NOTE: The ultravnc_dsm_helper only runs once. So after the first LISTEN" |
238 | echo " ends, you may have to Press Ctrl-C and restart for another connection." |
238 | echo " ends, you may have to Press Ctrl-C and restart for another connection." |
239 | @@ -3004,7 +3004,7 @@ |
239 | @@ -3102,7 +3102,7 @@ |
240 | vnc_hp="exec=$STUNNEL $tmp_cfg" |
240 | vnc_hp="exec=$STUNNEL $tmp_cfg" |
241 | fi |
241 | fi |
242 | echo "$VNCVIEWERCMD" "$@" "$vnc_hp" |
242 | echo "$VNCVIEWERCMD" "$@" "$vnc_hp" |
243 | - trap "final" 0 2 15 |
243 | - trap "final" 0 2 15 |
244 | + trap "final" 0 INT TERM |
244 | + trap "final" 0 INT TERM |
245 | echo "" |
245 | echo "" |
246 | $VNCVIEWERCMD "$@" "$vnc_hp" |
246 | $VNCVIEWERCMD "$@" "$vnc_hp" |
247 | if [ $? != 0 ]; then |
247 | if [ $? != 0 ]; then |
248 | @@ -3019,7 +3019,7 @@ |
248 | @@ -3117,7 +3117,7 @@ |
249 | echo "" |
249 | echo "" |
250 | echo "NOTE: Press Ctrl-C to terminate viewer LISTEN mode." |
250 | echo "NOTE: Press Ctrl-C to terminate viewer LISTEN mode." |
251 | echo "" |
251 | echo "" |
252 | - trap "final" 0 2 15 |
252 | - trap "final" 0 2 15 |
253 | + trap "final" 0 INT TERM |
253 | + trap "final" 0 INT TERM |