|
Lines 1-39
Link Here
|
| 1 |
--- develop/install.orig Fri Mar 13 01:16:41 1998 |
1 |
--- develop/install.orig Fri Apr 17 13:47:44 1998 |
| 2 |
+++ develop/install Sat Apr 4 18:53:55 1998 |
2 |
+++ develop/install Fri May 22 19:51:13 1998 |
| 3 |
@@ -113,17 +113,9 @@ |
3 |
@@ -162,13 +162,6 @@ |
| 4 |
if [ "$INETDCONF" = "" ]; then INETDCONF=/etc/inetd.conf; fi |
|
|
| 5 |
if [ "$SERVICES" = "" ]; then SERVICES=/etc/services; fi |
| 6 |
|
| 7 |
-if [ -f /usr/man/man7/locale.7 -o -f /usr/man/man7/term.7 ]; then |
| 8 |
- manmisc=7 |
| 9 |
-else |
| 10 |
- manmisc=5 |
| 11 |
-fi |
| 12 |
+manmisc=7 |
| 13 |
|
| 14 |
-if [ -f /usr/man/man8/inetd.8 ]; then |
| 15 |
- manadmin=8 |
| 16 |
-else |
| 17 |
- manadmin=1m |
| 18 |
-fi |
| 19 |
+manadmin=8 |
| 20 |
|
| 21 |
# purge old logfiles (bug from sendfile revision < 19980310) |
| 22 |
(cd $SPOOL && rm -f */.sendfile*.log) |
| 23 |
@@ -132,7 +124,7 @@ |
| 24 |
umask 022 |
| 25 |
cd src || exit 1 |
| 26 |
cp sendfile sendmsg receive utf7encode fetchfile wlock $BINDIR/ |
| 27 |
- [ -x $SERVERDIR/sendfiled ] && mv $SERVERDIR/sendfiled $SERVERDIR/sendfiled.old && rm $SERVERDIR/sendfiled.old |
| 28 |
+ [ -x $SERVERDIR/sendfiled ] && mv $SERVERDIR/sendfiled $SERVERDIR/sendfiled.old && rm -f $SERVERDIR/sendfiled.old |
| 29 |
cp sendfiled $SERVERDIR |
| 30 |
cd .. |
| 31 |
install_man |
| 32 |
@@ -156,14 +148,6 @@ |
| 33 |
To deinstall the sendfile-daemon, simply type: rm $SERVERDIR/sendfiled |
| 34 |
|
4 |
|
| 35 |
EOD |
5 |
EOD |
| 36 |
-echo 'If you are satisfied with these defaults, then type "ok" now:' |
6 |
echo 'If you are satisfied with these defaults, then type "ok" now:' |
| 37 |
-read answer |
7 |
-read answer |
| 38 |
-if [ "$answer" != ok ]; then |
8 |
-if [ "$answer" != ok ]; then |
| 39 |
- echo |
9 |
- echo |
|
Lines 44-59
Link Here
|
| 44 |
|
14 |
|
| 45 |
umask 022 |
15 |
umask 022 |
| 46 |
|
16 |
|
| 47 |
@@ -213,7 +197,7 @@ |
17 |
@@ -259,7 +252,6 @@ |
| 48 |
echo " there is $SERVERDIR/sendfiled in makeconfig! Check it!" |
|
|
| 49 |
fi |
| 50 |
echo "installing the sendfile-daemon in $SERVERDIR" |
| 51 |
-[ -x $SERVERDIR/sendfiled ] && mv $SERVERDIR/sendfiled $SERVERDIR/sendfiled.old && rm $SERVERDIR/sendfiled.old |
| 52 |
+[ -x $SERVERDIR/sendfiled ] && mv $SERVERDIR/sendfiled $SERVERDIR/sendfiled.old && rm -f $SERVERDIR/sendfiled.old |
| 53 |
cp src/sendfiled $SERVERDIR || exit 1 |
| 54 |
|
| 55 |
NOSENDFILE=`dirname $DENY 2>/dev/null`/nosendfile |
| 56 |
@@ -259,7 +243,6 @@ |
| 57 |
echo "saft 487/tcp # simple asynchronous file transfer" | niload services . |
18 |
echo "saft 487/tcp # simple asynchronous file transfer" | niload services . |
| 58 |
else |
19 |
else |
| 59 |
echo "configuring $SERVICES" |
20 |
echo "configuring $SERVICES" |
|
Lines 61-67
Link Here
|
| 61 |
echo "saft 487/tcp # simple asynchronous file transfer" >>$SERVICES |
22 |
echo "saft 487/tcp # simple asynchronous file transfer" >>$SERVICES |
| 62 |
fi |
23 |
fi |
| 63 |
fi |
24 |
fi |
| 64 |
@@ -272,8 +255,6 @@ |
25 |
@@ -272,8 +264,6 @@ |
| 65 |
fi |
26 |
fi |
| 66 |
RESTART=true |
27 |
RESTART=true |
| 67 |
echo "configuring $INETDCONF" |
28 |
echo "configuring $INETDCONF" |
|
Lines 70-76
Link Here
|
| 70 |
echo "saft stream tcp nowait root $SFD" >>$INETDCONF |
31 |
echo "saft stream tcp nowait root $SFD" >>$INETDCONF |
| 71 |
fi |
32 |
fi |
| 72 |
|
33 |
|
| 73 |
@@ -337,15 +318,10 @@ |
34 |
@@ -337,15 +327,11 @@ |
| 74 |
EOD |
35 |
EOD |
| 75 |
fi |
36 |
fi |
| 76 |
|
37 |
|
|
Lines 87-92
Link Here
|
| 87 |
- echo |
48 |
- echo |
| 88 |
- echo "please restart now your inetd ( or simply reboot :-) )" |
49 |
- echo "please restart now your inetd ( or simply reboot :-) )" |
| 89 |
- echo |
50 |
- echo |
| 90 |
+ kill -HUP `ps auxw|awk '$11 == "inetd" { print $2 } '` |
51 |
+ kill -HUP `cat /var/run/inetd.pid` |
| 91 |
+ [ -f $SERVERDIR/sendfiled.old ] && rm -f $SERVERDIR/sendfiled.old |
52 |
+ [ -f $SERVERDIR/sendfiled.old ] && rm -f $SERVERDIR/sendfiled.old |
| 92 |
fi |
53 |
fi |
|
|
54 |
+echo done. |