From 90930420f8980194de1c9b8b386248bd2de1be16 Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Mon, 7 Jan 2008 19:46:39 +0000 Subject: [PATCH] Bumped version and added experimental Zenwalk support --- ChangeLog | 9 +++- SETUP.sh | 3 ++ TODO | 2 +- configure | 6 +-- configure.ac | 6 +-- script/installinit.sh | 99 +++++++++++++++++++++++-------------------- 6 files changed, 71 insertions(+), 54 deletions(-) diff --git a/ChangeLog b/ChangeLog index dba232ed..4bba9e01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,13 @@ $Id$ -v0.95.0 25-Nov-2007 +v0.95.1 07-Jan-2008 + + script: + Added experimental support for Zenwalk. + + +v0.95.0 25-Nov-2007 - 07-Jan-2008 mbcico: The maximum speed to show to the other end is now 4294976295. @@ -12,6 +18,7 @@ v0.95.0 25-Nov-2007 systems as negative numbers. + v0.92.0 08-Oct-2006 - 16-Oct-2007 general: diff --git a/SETUP.sh b/SETUP.sh index 8b439436..66de5fcb 100644 --- a/SETUP.sh +++ b/SETUP.sh @@ -75,6 +75,9 @@ if [ "$OSTYPE" = "Linux" ]; then else DISTVERS=$( cat /etc/slackware-version ) fi + elif [ -f /etc/zenwalk-version ]; then + DISTNAME="Zenwalk" + DISTVERS="Unknown" elif [ -f /etc/debian_version ]; then # Debian, at least since version 2.2 DISTNAME="Debian" diff --git a/TODO b/TODO index e1a35571..dc7c4d6f 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,6 @@ $Id$ - MBSE BBS V0.95.0 TODO list. + MBSE BBS V0.95.1 TODO list. --------------------------- These are a list of things that must be implemented one way or diff --git a/configure b/configure index 867014b6..66ab36bd 100755 --- a/configure +++ b/configure @@ -1741,10 +1741,10 @@ SUBDIRS="lib mbcico mbfido mbmon mbsebbs mbutils mbnntp mbtask mbsetup unix lang PACKAGE="mbsebbs" MAJOR="0" MINOR="95" -REVISION="0" +REVISION="1" VERSION="$MAJOR.$MINOR.$REVISION" -COPYRIGHT="Copyright (C) 1997-2007 Michiel Broek, All Rights Reserved" -SHORTRIGHT="Copyright (C) 1997-2007 M. Broek" +COPYRIGHT="Copyright (C) 1997-2008 Michiel Broek, All Rights Reserved" +SHORTRIGHT="Copyright (C) 1997-2008 M. Broek" GROUP="bbs" OWNER="mbse" ROWNER="`id -un root`" diff --git a/configure.ac b/configure.ac index 63cac64b..0e6bee54 100644 --- a/configure.ac +++ b/configure.ac @@ -13,10 +13,10 @@ AC_SUBST(SUBDIRS) PACKAGE="mbsebbs" MAJOR="0" MINOR="95" -REVISION="0" +REVISION="1" VERSION="$MAJOR.$MINOR.$REVISION" -COPYRIGHT="Copyright (C) 1997-2007 Michiel Broek, All Rights Reserved" -SHORTRIGHT="Copyright (C) 1997-2007 M. Broek" +COPYRIGHT="Copyright (C) 1997-2008 Michiel Broek, All Rights Reserved" +SHORTRIGHT="Copyright (C) 1997-2008 M. Broek" GROUP="bbs" OWNER="mbse" ROWNER="`id -un root`" diff --git a/script/installinit.sh b/script/installinit.sh index dada60f4..ae200f59 100644 --- a/script/installinit.sh +++ b/script/installinit.sh @@ -52,54 +52,47 @@ if [ "$OSTYPE" = "Linux" ]; then # Slackware 7.0 and later DISTNAME="Slackware" DISTVERS=`cat /etc/slackware-version` - else - if [ -f /etc/debian_version ]; then - # Debian, at least since version 2.2 - DISTNAME="Debian" - DISTVERS=`cat /etc/debian_version` - else - if [ -f /etc/SuSE-release ]; then - DISTNAME="SuSE" - DISTVERS=`cat /etc/SuSE-release | grep VERSION | awk '{ print $3 }'` + elif [ -f /etc/zenwalk-version ]; then + DISTNAME="Zenwalk" + DISTVERS=`cat /etc/zenwalk-version` + elif [ -f /etc/debian_version ]; then + # Debian, at least since version 2.2 + DISTNAME="Debian" + DISTVERS=`cat /etc/debian_version` + elif [ -f /etc/SuSE-release ]; then + DISTNAME="SuSE" + DISTVERS=`cat /etc/SuSE-release | grep VERSION | awk '{ print $3 }'` + elif [ -f /etc/mandrake-release ]; then + # Mandrake test before RedHat, Mandrake has a redhat-release + # file also which is a symbolic link to mandrake-release. + DISTNAME="Mandrake" + # Format: Linux Mandrake release 8.0 (Cooker) for i586 + DISTVERS="`cat /etc/mandrake-release | awk '{ print $4 }'`" + elif [ -f /etc/redhat-release ]; then + DISTNAME="RedHat" + if [ -z "`grep e-smith /etc/redhat-release`" ]; then + if [ -z "`grep Fedora /etc/redhat-release`" ]; then + DISTVERS=`cat /etc/redhat-release | awk '{ print $5 }'` else - # Mandrake test before RedHat, Mandrake has a redhat-release - # file also which is a symbolic link to mandrake-release. - if [ -f /etc/mandrake-release ]; then - DISTNAME="Mandrake" - # Format: Linux Mandrake release 8.0 (Cooker) for i586 - DISTVERS="`cat /etc/mandrake-release | awk '{ print $4 }'`" - else - if [ -f /etc/redhat-release ]; then - DISTNAME="RedHat" - if [ -z "`grep e-smith /etc/redhat-release`" ]; then - if [ -z "`grep Fedora /etc/redhat-release`" ]; then - DISTVERS=`cat /etc/redhat-release | awk '{ print $5 }'` - else - DISTVERS=`cat /etc/redhat-release | awk '{ print $4 }'` - DISTNAME="Fedora Core" - fi - else - DISTVERS=`cat /etc/redhat-release | awk '{ print $13 }' | tr -d \)` - fi - else - if [ -f /etc/gentoo-release ]; then - DISTNAME="Gentoo" - DISTVERS=`cat /etc/gentoo-release | awk '{ print $5 }'` - else - DISTNAME="Unknown" - log "!" "unknown distribution, collecting data" - log "-" "`uname -a`" - log "-" "`ls -la /etc`" - echo "Failed to install bootscripts, unknown Linux distribution." - echo "Please mail the file `pwd`/script/installinit.log to mbroek@users.sourceforge.net" - echo "or send it as file attach to Michiel Broek at 2:280/2802@Fidonet." - echo "Add information about the distribution you use in the message." - exit 1; - fi - fi - fi + DISTVERS=`cat /etc/redhat-release | awk '{ print $4 }'` + DISTNAME="Fedora Core" fi - fi + else + DISTVERS=`cat /etc/redhat-release | awk '{ print $13 }' | tr -d \)` + fi + elif [ -f /etc/gentoo-release ]; then + DISTNAME="Gentoo" + DISTVERS=`cat /etc/gentoo-release | awk '{ print $5 }'` + else + DISTNAME="Unknown" + log "!" "unknown distribution, collecting data" + log "-" "`uname -a`" + log "-" "`ls -la /etc`" + echo "Failed to install bootscripts, unknown Linux distribution." + echo "Please mail the file `pwd`/script/installinit.log to mbroek@users.sourceforge.net" + echo "or send it as file attach to Michiel Broek at 2:280/2802@Fidonet." + echo "Add information about the distribution you use in the message." + exit 1; fi fi if [ "$OSTYPE" = "FreeBSD" ]; then @@ -151,6 +144,20 @@ fi +#-------------------------------------------------------------------------- +# +# Adding scripts for Zenwalk +# +if [ "$DISTNAME" = "Zenwalk" ]; then + DISTINIT="/etc/rc.d/rc.zmbsed" + echo "Adding Zenwalk init script" + log "+" "Addiing Zenwalk init script" + cp init.Slackware $DISTINIT + chmod 755 $DISTINIT +fi + + + #-------------------------------------------------------------------------- # # Adding scripts for Slackware