Mercurial > noffle

changeset 341:8f8db12ae359 noffle

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] minor cleanup
author godisch
date Tue, 04 Mar 2003 22:16:42 +0000
parents 53b3cb6cae3d
children ba2ab2b440cb
files debian/config debian/init
diffstat 2 files changed, 14 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/debian/config	Tue Mar 04 21:20:07 2003 +0000
+++ b/debian/config	Tue Mar 04 22:16:42 2003 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: config 475 2003-03-04 21:08:27Z godisch $
+# $Id: config 477 2003-03-04 22:16:42Z godisch $
 
 set -e
 
@@ -76,24 +76,23 @@
 
 # read NOFFLE_FETCHMODE from $debian_config
 [ -s "$debian_config" ] && . $debian_config || :
-if [ "$NOFFLE_FETCHMODE" != ppp -a "$NOFFLE_FETCHMODE" != cron ]; then
-	if [ -x /usr/sbin/pppd ]; then
-		NOFFLE_FETCHMODE=ppp
-	else
-		NOFFLE_FETCHMODE=cron
-	fi
+[ "$NOFFLE_FETCHMODE" = ppp -o "$NOFFLE_FETCHMODE" = cron ] || \
+if [ -x /usr/sbin/pppd ]; then
+	NOFFLE_FETCHMODE=ppp
+else
+	NOFFLE_FETCHMODE=cron
 fi
 # do we need confirmation?
 db_get noffle/fetchmode || RET=""
 [ "$NOFFLE_FETCHMODE" = "$RET" ] || db_fset noffle/fetchmode seen false || :
 
 # input server port, parent server, username, password, fetchmode, maxfetch, default-expire
-db_input low noffle/port && db_go || :
-db_input high noffle/server && db_go || :
-db_input medium noffle/username  && db_go || :
-db_input medium noffle/password  && db_go || :
-db_input medium noffle/fetchmode && db_go || :
-db_input medium noffle/maxfetch  && db_go || :
+db_input low    noffle/port        && db_go || :
+db_input high   noffle/server      && db_go || :
+db_input medium noffle/username    && db_go || :
+db_input medium noffle/password    && db_go || :
+db_input medium noffle/fetchmode   && db_go || :
+db_input medium noffle/maxfetch    && db_go || :
 db_input low noffle/default-expire && db_go || :
 
 db_stop
--- a/debian/init	Tue Mar 04 21:20:07 2003 +0000
+++ b/debian/init	Tue Mar 04 22:16:42 2003 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: init 473 2003-03-04 20:40:26Z godisch $
+# $Id: init 477 2003-03-04 22:16:42Z godisch $
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 
@@ -9,9 +9,7 @@
 else
 	NOFFLE_FETCHMODE="cron"
 fi
-if [ -f /etc/default/noffle ]; then
-	. /etc/default/noffle
-fi
+[ -f /etc/default/noffle ] && . /etc/default/noffle || :
 
 [ -x "$NOFFLE" ] || exit 0