--- trunk/mage/usr/lib/mage/mage4.sh 2005/09/09 17:50:03 231 +++ trunk/mage/usr/lib/mage/mage4.sh 2005/09/09 17:52:55 232 @@ -1,6 +1,6 @@ #!/bin/sh # Magellan Linux Installer (mage.sh) -# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.sh,v 1.2 2005-09-09 17:49:43 niro Exp $ +# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.sh,v 1.3 2005-09-09 17:52:55 niro Exp $ # default die function die() @@ -10,22 +10,22 @@ } # include all needed files -# [ -f ${MLIBDIR}/conf/mage.rc.global ] && \ -# source ${MLIBDIR}/conf/mage.rc.global || \ -# die "${MLIBDIR}/conf/mage.rc.global missing" -# -# [ -f /etc/mage.rc ] && source /etc/mage.rc || \ -# die "Your /etc/mage.rc is missing. Aborting." -# -# [ -f ${MLIBDIR}/mage.functions.sh ] && \ -# source ${MLIBDIR}/mage.functions.sh || \ -# die "mage functions missing" +[ -f ${MLIBDIR}/conf/mage.rc.global ] && \ + source ${MLIBDIR}/conf/mage.rc.global || \ + die "${MLIBDIR}/conf/mage.rc.global missing" + +[ -f /etc/mage.rc ] && source /etc/mage.rc || \ + die "Your /etc/mage.rc is missing. Aborting." + +[ -f ${MLIBDIR}/mage.functions.sh ] && \ + source ${MLIBDIR}/mage.functions.sh || \ + die "mage functions missing" # for tests only -source /home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage/mage.rc.global -source /etc/mage.rc -source /home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh -MLIBDIR=/home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage +#source /home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage/mage.rc.global +#source /etc/mage.rc +#source /home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh +#MLIBDIR=/home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage ## only for tests -> normally in /etc/rc.d/init.d/functions COLRED="\033[1;6m\033[31m"