projects / packages / dchub.git / blame
| Commit | Line | Data |
|---|---|---|
| 23d08351 AA |
1 | diff -Nur old/dchub.init.in new/dchub.init.in |
| 2 | --- old/dchub.init.in 2003-10-19 15:32:52.000000000 +0000 | |
| 6773fcae AA |
3 | +++ new/dchub.init.in 2003-12-13 13:57:03.000000000 +0000 |
| 4 | @@ -35,40 +35,26 @@ | |
| 5 | DCHUB_XMLCONFFILE=$DCHUB_DBDIR/conf.xml | |
| 6 | DCHUB_XMLUSERFILE=$DCHUB_DBDIR/users.xml | |
| 4d172e58 | 7 | DCHUB_HUBPASSFILE=$DCHUB_DBDIR/dchub.hubpasswd |
| 6773fcae AA |
8 | -DCHUB_CRCFILE=$DCHUB_DBDIR/dchub.crc |
| 9 | +DCHUB_CRCFILE=@DCHUB_CRCDIR@/dchub.crc | |
| 4d172e58 AA |
10 | DCHUB_SCRIPTDIR=$DCHUB_LIBEXECDIR/scripts |
| 11 | +DCHUB_PLUGINSDIR=$DCHUB_LIBEXECDIR/plugins | |
| 12 | DCHUB_MAINSCRIPT=main.pl | |
| 13 | DCHUB_EXTPROGDIR=$DCHUB_LIBEXECDIR/extprog | |
| 14 | DCHUB_TOOLSDIR=$DCHUB_LIBEXECDIR/tools | |
| 23d08351 | 15 | |
| 4d172e58 AA |
16 | -OPTIONS="--UID=$DCHUB_UID --conf=$DCHUB_XMLCONFFILE --user=$DCHUB_XMLUSERFILE --hubpasswd=$DCHUB_HUBPASSFILE --crc=$DCHUB_CRCFILE --pscriptdir=$DCHUB_SCRIPTDIR --pscriptinit=$DCHUB_MAINSCRIPT --exprogdir=$DCHUB_EXTPROGDIR --logfile=$DCHUB_LOGFILE" |
| 17 | +OPTIONS="--UID=$DCHUB_UID --conf=$DCHUB_XMLCONFFILE --user=$DCHUB_XMLUSERFILE --hubpasswd=$DCHUB_HUBPASSFILE --crc=$DCHUB_CRCFILE --pscriptdir=$DCHUB_SCRIPTDIR --linkdir=$DCHUB_PLUGINSDIR --pscriptinit=$DCHUB_MAINSCRIPT --exprogdir=$DCHUB_EXTPROGDIR --logfile=$DCHUB_LOGFILE" | |
| 23d08351 AA |
18 | |
| 19 | -# | |
| 20 | -# Determine which kind of configuration we're using | |
| 21 | -# | |
| 22 | -system=unknown | |
| 23 | -if [ -f /etc/debian_version ]; then | |
| 24 | - system=debian | |
| 25 | -elif [ -f /etc/redhat-release ]; then | |
| 26 | - system=redhat | |
| 27 | -else | |
| 28 | - echo "$0: Unknown system, please report on http://savannah.nongnu.org/support/?group=dchub" 1>&2 | |
| 29 | - exit 1 | |
| 30 | -fi | |
| 31 | - | |
| 32 | -if [ $system = redhat ]; then | |
| 33 | - # Source function library. | |
| 34 | - . $initdir/functions | |
| 35 | - | |
| 36 | - # Source networking configuration. | |
| 37 | - . /etc/sysconfig/network | |
| 38 | - | |
| 39 | - # Check that networking is up. | |
| 40 | - [ ${NETWORKING} = "no" ] && exit 0 | |
| 41 | - | |
| 42 | - # Pull in sysconfig settings | |
| 43 | - [ -f /etc/sysconfig/dchub ] && . /etc/sysconfig/dchub | |
| 44 | -fi | |
| 45 | +# Source function library. | |
| 46 | +. $initdir/functions | |
| 47 | + | |
| 48 | +# Source networking configuration. | |
| 49 | +. /etc/sysconfig/network | |
| 50 | + | |
| 51 | +# Check that networking is up. | |
| 52 | +[ ${NETWORKING} = "no" ] && exit 0 | |
| 53 | + | |
| 54 | +# Pull in sysconfig settings | |
| 55 | +[ -f /etc/sysconfig/dchub ] && . /etc/sysconfig/dchub | |
| 56 | ||
| 57 | [ -x "$DCHUB" ] || exit 0 | |
| 58 | [ -d "$DCHUB_DBDIR" ] || exit 0 | |
| 6773fcae AA |
59 | @@ -78,7 +64,7 @@ |
| 60 | do_init_db() { | |
| 61 | if [ ! -f $DCHUB_XMLCONFFILE -a ! -f $DCHUB_XMLUSERFILE -a ! -f $DCHUB_HUBPASSFILE -a ! -f $DCHUB_CRCFILE ]; then | |
| 62 | echo -n $"Initializing the database: " | |
| 63 | - if $DCHUB --init $OPTIONS >&/dev/null; then | |
| 64 | + if $DCHUB --init $OPTIONS >/dev/null; then | |
| 65 | success $"DcHub database creation" | |
| 66 | echo | |
| 67 | echo $"You can now log into the hub with the account MASTER" |