Menu
▾
▴
[Genericircd-devel] gircd2.0 Makefile.in,1.1.1.1,1.2 README,1.1.1.1,1.2 installer,1.6,1.7 motd-maker,1.1.1.1,1.2
|
From: <sto...@us...> - 2003-10-20 19:15:29
|
Update of /cvsroot/genericircd/gircd2.0
In directory sc8-pr-cvs1:/tmp/cvs-serv23925
Modified Files:
Makefile.in README installer motd-maker
Log Message:
fixed minor installer bugs, added BSD installer, added some missing files, and moved all documentation to doc/. Commit on behalf of Ishtar
Index: Makefile.in
===================================================================
RCS file: /cvsroot/genericircd/gircd2.0/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.in 12 Jul 2003 20:07:48 -0000 1.1.1.1
--- Makefile.in 20 Oct 2003 09:27:41 -0000 1.2
***************
*** 58,62 ****
root-clean:
! @for i in '*.orig' '.*.orig' '\#*' '*~' '.*~' '*.bak' '.*.bak' core; do\
echo "Removing $$i"; \
REMOVE_FILES="`find . -name "$$i" -print`"; \
--- 58,62 ----
root-clean:
! @for i in '*.orig' '.*.orig' '\#*' '*~' '.*~' '*.bak' '.*.bak' 'name.txt' 'olines.txt' 'opers.txt' 'pwd' 'clean' core; do\
echo "Removing $$i"; \
REMOVE_FILES="`find . -name "$$i" -print`"; \
Index: README
===================================================================
RCS file: /cvsroot/genericircd/gircd2.0/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README 12 Jul 2003 20:07:48 -0000 1.1.1.1
--- README 20 Oct 2003 09:27:41 -0000 1.2
***************
*** 1 ****
! Read INSTALL for help.
--- 1,2 ----
! Read doc/INSTALL for help on installation.
! All documentation as been moved to doc/
Index: installer
===================================================================
RCS file: /cvsroot/genericircd/gircd2.0/installer,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** installer 17 Oct 2003 16:49:10 -0000 1.6
--- installer 20 Oct 2003 09:27:41 -0000 1.7
***************
*** 5,10 ****
# contact us first.
#
! # Script was successfully tested on Gentoo 1.4
! # Please email me (dia...@ge...) if you have major problems.
# or (is...@ge...)
# This software is under GNU General Public License, so the appropriate
--- 5,11 ----
# contact us first.
#
! # Script was successfully tested on Gentoo-1.4, RedHat7.x & 9.x,
! # Mandrake 9.x, Debian.
! # Please email (dia...@ge...) if you have major problems.
# or (is...@ge...)
# This software is under GNU General Public License, so the appropriate
***************
*** 22,26 ****
# Created by Ishtar & StoneC0ld
# Adapted by Diaboliq to suit 2.0 needs
! # Last updated 2003-09-13
clear
--- 23,28 ----
# Created by Ishtar & StoneC0ld
# Adapted by Diaboliq to suit 2.0 needs
! # Updated by Ishtar to fix *BSD problems.
! # Last updated 2003-10-20
clear
***************
*** 38,41 ****
--- 40,46 ----
echo See doc/README.installer-basic for more details.
echo
+ echo \*\*\*\*\* WARNING: DO NOT USE THE INSTALLER UNDER \*BSD SYSTEMS \*\*\*\*\*
+ echo \*\*\*\*\* USE ./installer.bsd INSTEAD \*\*\*\*\*
+
sleep 5
***************
*** 81,85 ****
# on the hdd. #
# Note that this only seems to work on some #
! # recent versions of bash only. -- Ishtar #
###################################################
--- 86,90 ----
# on the hdd. #
# Note that this only seems to work on some #
! # recent versions of bash. -- Ishtar #
###################################################
***************
*** 109,113 ****
echo
echo
! echo Basic installation completed. Make sure to edit your ircd.conf and MOTD\'s.
echo
exit
--- 114,120 ----
echo
echo
! echo Basic installation completed.
! echo You will need to copy ircd.conf and your MOTDs from your
! echo gircd2.0/doc dir to $INSTALLDIR and edit them.
echo
exit
***************
*** 242,252 ****
echo
read -p "Enter server name (City.State.Country.GenericNet.Org):" SBSERVERNAME
! elif [ -e ../name.txt ]
then
! rm -f ../name.txt
! touch ../name.txt
! echo This server is: $SBSERVERNAME >> ../name.txt
else
! echo This server is: $SBSERVERNAME >> ../name.txt
fi
if [ "$REPLY" == "2" ];
--- 249,259 ----
echo
read -p "Enter server name (City.State.Country.GenericNet.Org):" SBSERVERNAME
! elif [ -e name.txt ]
then
! rm -f name.txt
! touch name.txt
! echo This server is: $SBSERVERNAME >> name.txt
else
! echo This server is: $SBSERVERNAME >> name.txt
fi
if [ "$REPLY" == "2" ];
***************
*** 342,352 ****
echo Y:15:90:0:100:160000 >> $INSTALLDIR/ircd.conf
echo Y:10:90:0:100:160000 >> $INSTALLDIR/ircd.conf
! echo Y:2:90:0:5:160000 >> $INSTALLDIR/ircd.conf
echo Y:1:90:0:400:160000 >> $INSTALLDIR/ircd.conf
- echo Y:3:90:0:5:160000 >> $INSTALLDIR/ircd.conf
echo >> $INSTALLDIR/ircd.conf
echo \# I:Lines \(EDIT AT YOUR OWN RISK\) >> $INSTALLDIR/ircd.conf
! echo I:*\@*::Unresolved::3 >> $INSTALLDIR/ircd.conf
! echo I:Resolved::*\@*::2 >> $INSTALLDIR/ircd.conf
echo >> $INSTALLDIR/ircd.conf
echo \# U:Line \(DO NOT TOUCH!!\) >> $INSTALLDIR/ircd.conf
--- 349,358 ----
echo Y:15:90:0:100:160000 >> $INSTALLDIR/ircd.conf
echo Y:10:90:0:100:160000 >> $INSTALLDIR/ircd.conf
! echo Y:2:90:0:5:80000 >> $INSTALLDIR/ircd.conf
echo Y:1:90:0:400:160000 >> $INSTALLDIR/ircd.conf
echo >> $INSTALLDIR/ircd.conf
echo \# I:Lines \(EDIT AT YOUR OWN RISK\) >> $INSTALLDIR/ircd.conf
! echo I:*\@*::Unresolved::1 >> $INSTALLDIR/ircd.conf
! echo I:Resolved::*\@*::1 >> $INSTALLDIR/ircd.conf
echo >> $INSTALLDIR/ircd.conf
echo \# U:Line \(DO NOT TOUCH!!\) >> $INSTALLDIR/ircd.conf
***************
*** 406,410 ****
echo "# S:moo.fish.moo:elitepassword::" >> $INSTALLDIR/ircd.conf
echo "# Oper sethost for 'moo.fish.moo' with auto on 'ident@*.example.com'" >> $INSTALLDIR/ircd.conf
! echo "# S:moo.fish.moo::*.example.com:ident" >> $INSTALLDIR/ircd.con
echo F:RANDOM_SEED:25413652 >> $INSTALLDIR/ircd.conf
echo >> $INSTALLDIR/ircd.conf
--- 412,416 ----
echo "# S:moo.fish.moo:elitepassword::" >> $INSTALLDIR/ircd.conf
echo "# Oper sethost for 'moo.fish.moo' with auto on 'ident@*.example.com'" >> $INSTALLDIR/ircd.conf
! echo "# S:moo.fish.moo::*.example.com:ident" >> $INSTALLDIR/ircd.conf
echo F:RANDOM_SEED:25413652 >> $INSTALLDIR/ircd.conf
echo >> $INSTALLDIR/ircd.conf
***************
*** 577,587 ****
# Finally, remove crap generated by applying/reversing patches
! rm -f $PWD/ircd/*.*.rej >> $PWD/rej
! rm -f $PWD/include/*.*.rej >> $PWD/rej
! rm -f $PWD/doc/*.*.rej >> $PWD/rej
! rm -f $PWD/ircd/*.*.orig >> $PWD/rej
! rm -f $PWD/include/*.*.orig >> $PWD/rej
! rm -f $PWD/doc/*.*.orig >> $PWD/rej
! rm -f $PWD/rej
cd $PWD
--- 583,594 ----
# Finally, remove crap generated by applying/reversing patches
! # Dont need it anymore....
! #rm -f $PWD/ircd/*.*.rej >> $PWD/rej
! #rm -f $PWD/include/*.*.rej >> $PWD/rej
! #rm -f $PWD/doc/*.*.rej >> $PWD/rej
! #rm -f $PWD/ircd/*.*.orig >> $PWD/rej
! #rm -f $PWD/include/*.*.orig >> $PWD/rej
! #rm -f $PWD/doc/*.*.orig >> $PWD/rej
! #rm -f $PWD/rej
cd $PWD
***************
*** 708,713 ****
echo
echo Suggestions/comments about this script
! echo should be sent to StoneC0ld\@GenericNet.Org
! echo and/or Ishtar\@GenericNet.Org
echo --------------------------------------------------------------------------------
echo
--- 715,720 ----
echo
echo Suggestions/comments about this script
! echo should be sent to StoneC0ld\@GenericNet.Org,
! echo Ishtar\@GenericNet.Org and/or Diaboliq\@GenericNet.Org.
echo --------------------------------------------------------------------------------
echo
Index: motd-maker
===================================================================
RCS file: /cvsroot/genericircd/gircd2.0/motd-maker,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** motd-maker 12 Jul 2003 20:07:54 -0000 1.1.1.1
--- motd-maker 20 Oct 2003 09:27:41 -0000 1.2
***************
*** 40,44 ****
echo Your Operators are: >> $INSTALLDIR/ircd.motd
cat $PWD/opers.txt >> $INSTALLDIR/ircd.motd
! cat $PWD/motd >> $INSTALLDIR/ircd.motd
echo Using installer generated information to create MOTD....
else
--- 40,44 ----
echo Your Operators are: >> $INSTALLDIR/ircd.motd
cat $PWD/opers.txt >> $INSTALLDIR/ircd.motd
! cat $PWD/doc/motd.templ >> $INSTALLDIR/ircd.motd
echo Using installer generated information to create MOTD....
else
|
