]> git.pld-linux.org Git - packages/PowerChutePlus.git/blame - PowerChutePlus-fix-sh.patch
projects / packages / PowerChutePlus.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- mass commit: cosmetics (removed trailing white spaces)
[packages/PowerChutePlus.git] / PowerChutePlus-fix-sh.patch
CommitLineData
ec1d83db
JR		 1diff -ur PowerChutePlus-4.5.2.orig/addpage.sh PowerChutePlus-4.5.2/addpage.sh
2--- PowerChutePlus-4.5.2.orig/addpage.sh Tue Oct 5 06:02:20 1999
3+++ PowerChutePlus-4.5.2/addpage.sh Sun Jul 2 01:33:38 2000
4@@ -27,7 +27,7 @@
5 cmd=$2
6 delay=$3
7
8-. ./what_os.sh
9+. /usr/lib/powerchute/what_os.sh
10
11 case "$OS" in
12 $UWARE7)
13@@ -46,7 +46,7 @@
14 ;;
15 esac
16
17-. ./what_os.sh
18+. /usr/lib/powerchute/what_os.sh
19
20 if [ "$OS" = "$LINUX" ]
21 then
22@@ -54,7 +54,3 @@
23 else
24 echo "~!sleep $delay" >> $script
25 fi
26-
27-
28-
29-
30diff -ur PowerChutePlus-4.5.2.orig/dialpager.sh PowerChutePlus-4.5.2/dialpager.sh
31--- PowerChutePlus-4.5.2.orig/dialpager.sh Tue Oct 5 06:02:20 1999
32+++ PowerChutePlus-4.5.2/dialpager.sh Sun Jul 2 01:33:38 2000
33@@ -16,11 +16,11 @@
34 #----------------------------------------------------------------------
35
36
37-PATH=/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/ccs/bin
38+PATH=/bin:/usr/bin:/sbin:/usr/sbin
39 export PATH
40
41 PWRCHUTE=GSUB_PWRCHUTE_ENV_HERE
42-TMPDIR=$PWRCHUTE/.tmp
43+TMPDIR=/tmp
44 export TMPDIR
45 export PWRCHUTE
46
47@@ -69,11 +69,11 @@
48 }
49
50
51-modemlock=$TMPDIR/modemlock
52+modemlock=$TMPDIR/upsd.modemlock
53 tmpcommand=$TMPDIR/$$.command
54 tmpfile=$TMPDIR/$$.page
55
56-. ./what_os.sh
57+. /usr/lib/powerchute/what_os.sh
58
59 # if modemlock exists, then exit
60 if [ -r $modemlock ]
61@@ -133,11 +133,3 @@
62 then
63 rm -f $modemlock
64 fi
65-
66-
67-
68-
69-
70-
71-
72-
73diff -ur PowerChutePlus-4.5.2.orig/killbk.sh PowerChutePlus-4.5.2/killbk.sh
74--- PowerChutePlus-4.5.2.orig/killbk.sh Tue Oct 5 06:02:20 1999
75+++ PowerChutePlus-4.5.2/killbk.sh Sun Jul 2 01:50:07 2000
76@@ -15,17 +15,13 @@
77 # more than that of awk
78 # -----------------------------------------------------------------------
79
80- . ./what_os.sh
81- if [ "$OS" = "LINUX" ]
82- then
83- ps ax | awk '/pwrchu/ {print $1}' > tmp.pid
84- else
85- ps -e | awk '/pwrchu/ {print $1}' > tmp.pid
86- fi
87+ TMPFILE="`mktemp /tmp/pcpc.pid.XXXXXX`"
88+ . /usr/lib/powerchute/what_os.sh
89+ ps ax | awk '/pwrchu/ && !/awk/ {print $1}' > $TMPFILE
90
91- if [ -s tmp.pid ] #Exists and file size greater than 0
92+ if [ -s $TMPFILE ] #Exists and file size greater than 0
93 then
94- set `cat tmp.pid`
95+ set `cat $TMPFILE`
96 while [ ! -z "$1" ]
97 do
98 echo "killing powerchute client with pid = $1"
99@@ -35,18 +31,17 @@
100 done
101 fi
102
103- rm -f tmp.pid
104+ rm -f $TMPFILE
105 }
106
107
108 KillPCPClients
109
110
111-if [ -s bkupsd.pid ]
112+if [ -s /var/run/bkupsd.pid ]
113 then
114- set `cat bkupsd.pid`
115+ set `cat /var/run/bkupsd.pid`
116 kill -INT $1
117- rm -f bkupsd.pid
118+ rm -f /var/run/bkupsd.pid
119 fi
120-
121
122diff -ur PowerChutePlus-4.5.2.orig/killpc.sh PowerChutePlus-4.5.2/killpc.sh
123--- PowerChutePlus-4.5.2.orig/killpc.sh Tue Oct 5 06:02:20 1999
124+++ PowerChutePlus-4.5.2/killpc.sh Sun Jul 2 01:33:38 2000
125@@ -9,12 +9,12 @@
126 # Usage: ./killpc.sh
127 #
128
129-if [ -s upsd.pid ]
130+if [ -s /var/run/upsd.pid ]
131 then
132- set `cat upsd.pid`
133+ set `cat /var/run/upsd.pid`
134 echo "Killing upsd instance running with pid $1"
135 kill $1
136- rm -f upsd.pid
137+ rm -f /var/run/upsd.pid
138 echo "Done."
139 else
140 echo "No instance of upsd detected to be running!"
141diff -ur PowerChutePlus-4.5.2.orig/mailer.sh PowerChutePlus-4.5.2/mailer.sh
142--- PowerChutePlus-4.5.2.orig/mailer.sh Tue Oct 5 06:02:20 1999
143+++ PowerChutePlus-4.5.2/mailer.sh Sun Jul 2 01:33:38 2000
144@@ -24,11 +24,11 @@
145 # a script parameter and also added PWRCHUTE env variable
146 #
147
148-PATH=/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/ccs/bin
149+PATH=/bin:/usr/bin:/sbin:/usr/sbin
150 export PATH
151
152 PWRCHUTE=GSUB_PWRCHUTE_ENV_HERE
153-TMPDIR=$PWRCHUTE/.tmp
154+TMPDIR=/tmp
155 export TMPDIR
156 export PWRCHUTE
157
158@@ -58,7 +58,4 @@
159 then
160 rm -f $MSG
161 fi
162-
163-
164-
165
166diff -ur PowerChutePlus-4.5.2.orig/notifier.sh PowerChutePlus-4.5.2/notifier.sh
167--- PowerChutePlus-4.5.2.orig/notifier.sh Tue Oct 5 06:02:20 1999
168+++ PowerChutePlus-4.5.2/notifier.sh Sun Jul 2 01:33:38 2000
169@@ -21,23 +21,12 @@
170 #
171
172
173-PATH=/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/ccs/bin
174+PATH=/bin:/usr/bin:/sbin:/usr/sbin
175 export PATH
176
177 USR_LIST=$1
178 MSG=$2
179
180-Echo() {
181- string="$1"
182- if [ -r /usr/5bin/echo ]
183- then
184- /usr/5bin/echo "$string"
185- else
186- echo "$string"
187- fi
188-}
189-
190-
191 if [ -s $USR_LIST ]
192 then
193
194@@ -51,8 +40,3 @@
195
196 rm -f $USR_LIST
197 rm -f $MSG
198-
199-
200-
201-
202-
203diff -ur PowerChutePlus-4.5.2.orig/pcshut.sh PowerChutePlus-4.5.2/pcshut.sh
204--- PowerChutePlus-4.5.2.orig/pcshut.sh Tue Oct 5 06:02:20 1999
205+++ PowerChutePlus-4.5.2/pcshut.sh Sun Jul 2 01:49:42 2000
206@@ -41,17 +41,13 @@
207 # more than that of awk
208 # -----------------------------------------------------------------------
209
210- . ./what_os.sh
211- if [ "$OS" = "LINUX" ]
212- then
213- ps ax | awk '/pwrchu/ {print $1}' > tmp.pid
214- else
215- ps -e | awk '/pwrchu/ {print $1}' > tmp.pid
216- fi
217+ TMPFILE="`mktemp /tmp/pcpc.pid.XXXXXX`"
218+ . /usr/lib/powerchute/what_os.sh
219+ ps ax | awk '/pwrchu/ && !/awk/ {print $1}' > $TMPFILE
220
221- if [ -s tmp.pid ] #Exists and file size greater than 0
222+ if [ -s $TMPFILE ] #Exists and file size greater than 0
223 then
224- set `cat tmp.pid`
225+ set `cat $TMPFILE`
226 while [ ! -z "$1" ]
227 do
228 echo "killing powerchute client with pid = $1"
229@@ -61,13 +57,13 @@
230 done
231 fi
232
233- rm -f tmp.pid
234+ rm -f $TMPFILE
235 }
236
237
238 KillPCPClients
239
240-. ./what_os.sh
241+. /usr/lib/powerchute/what_os.sh
242
243 if [ $SHUTDOWN_TYPE = "QUICK" ]
244 then
245@@ -123,10 +119,4 @@
246 ;;
247 esac
248 fi
249-
250-
251-
252-
253-
254-
255
256diff -ur PowerChutePlus-4.5.2.orig/wall.sh PowerChutePlus-4.5.2/wall.sh
257--- PowerChutePlus-4.5.2.orig/wall.sh Tue Oct 5 06:02:20 1999
258+++ PowerChutePlus-4.5.2/wall.sh Sun Jul 2 01:33:38 2000
259@@ -25,7 +25,7 @@
260 # djs18Oct95: UnixWare cannot write to /dev/pts000
261 #
262
263-PATH=/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/ccs/bin
264+PATH=/bin:/usr/bin:/sbin:/usr/sbin
265 export PATH
266
267 MSG=$1
268@@ -50,7 +50,7 @@
269 if [ -r $MSG ]
270 then
271
272- . ./what_os.sh
273+ . /usr/lib/powerchute/what_os.sh
274
275 case "$OS" in
276 $UWARE1)
277@@ -65,17 +65,4 @@
278
279 rm -f $MSG
280 fi
281-
282-
283-
284-
285-
286-
287-
288-
289-
290-
291-
292-
293-
294
295diff -ur PowerChutePlus-4.5.2.orig/what_os.sh PowerChutePlus-4.5.2/what_os.sh
296--- PowerChutePlus-4.5.2.orig/what_os.sh Tue Oct 5 06:02:20 1999
297+++ PowerChutePlus-4.5.2/what_os.sh Sun Jul 2 01:33:38 2000
298@@ -57,65 +57,65 @@
299 OS="OS_UNKNOWN"
300
301
302-PATH=/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/ccs/bin
303+PATH=/bin:/usr/bin:/sbin:/usr/sbin
304 export PATH
305
306-if [ ! -r machine_def ]
307+if [ ! -r /usr/lib/powerchute/machine_def ]
308 then
309 echo "Improper installation, or corrupted product tree: No machine_def file"
310 exit
311 fi
312
313-if [ -r SOLARIS2X ]
314+if [ -r /usr/lib/powerchute/SOLARIS2X ]
315 then
316 OS=$SOLARIS2X
317-elif [ -r SOLARIS2X86 ]
318+elif [ -r /usr/lib/powerchute/SOLARIS2X86 ]
319 then
320 OS=$SOLARIS2X86
321-elif [ -r AIX3 ]
322+elif [ -r /usr/lib/powerchute/AIX3 ]
323 then
324 OS=$AIX3
325-#elif [ -r AIX324- ] || [ -r AIX324+ ]
326-elif [ -r AIX4 ]
327+#elif [ -r /usr/lib/powerchute/AIX324- ] || [ -r /usr/lib/powerchute/AIX324+ ]
328+elif [ -r /usr/lib/powerchute/AIX4 ]
329 then
330 OS=$AIX4
331-elif [ -r HPUX9 ]
332+elif [ -r /usr/lib/powerchute/HPUX9 ]
333 then
334 OS=$HPUX9
335-elif [ -r HPUX10 ]
336+elif [ -r /usr/lib/powerchute/HPUX10 ]
337 then
338 OS=$HPUX10
339-elif [ -r SUNOS4 ]
340+elif [ -r /usr/lib/powerchute/SUNOS4 ]
341 then
342 OS=$SUNOS4
343-elif [ -r UWARE1 ]
344+elif [ -r /usr/lib/powerchute/UWARE1 ]
345 then
346 OS=$UWARE1
347-elif [ -r UWARE2 ]
348+elif [ -r /usr/lib/powerchute/UWARE2 ]
349 then
350 OS=$UWARE2
351-elif [ -r NCR ]
352+elif [ -r /usr/lib/powerchute/NCR ]
353 then
354 OS=$NCR
355-elif [ -r SCO ]
356+elif [ -r /usr/lib/powerchute/SCO ]
357 then
358 OS=$SCO
359-elif [ -r SGI ]
360+elif [ -r /usr/lib/powerchute/SGI ]
361 then
362 OS=$SGI
363-elif [ -r OLIVETTI ]
364+elif [ -r /usr/lib/powerchute/OLIVETTI ]
365 then
366 OS=$OLIV
367-elif [ -r UNISYS ]
368+elif [ -r /usr/lib/powerchute/UNISYS ]
369 then
370 OS=$USYS
371-elif [ -r ALPHAOSF ]
372+elif [ -r /usr/lib/powerchute/ALPHAOSF ]
373 then
374 OS=$ALPHAOSF
375-elif [ -r UWARE7 ]
376+elif [ -r /usr/lib/powerchute/UWARE7 ]
377 then
378 OS=$UWARE7
379-elif [ -r LINUX ]
380+elif [ -r /usr/lib/powerchute/LINUX ]
381 then
382 OS=$LINUX
383 else
384@@ -129,12 +129,7 @@
385 case $1 in
386 SHOWME | showme)
387 echo $OS
388- cat machine_def
389+ cat /usr/lib/powerchute/machine_def
390 ;;
391 esac
392-
393-
394-
395-
396-
397
UPS management software for APC UPS models
This page took 0.172937 seconds and 4 git commands to generate.