[eggheads-patches] PATCH: textdir.patch

Peter 'Rattacresh' Backes rtc at rhrk.uni-kl.de
Sat Oct 9 09:11:32 CST 1999


This patch should only be applied if noone disagrees.

* renames 'telnet-banner' to 'banner'
* moves banner and motd to text/-dir
* logfiles now go to logs/-dir by default.
* default config file is now eggdrop.conf


-- Peter 'Rattacresh' Backes, rtc at rhrk.uni-kl.de

-------------- next part --------------
diff -urN eggdrop1.3.29/Makefile.in eggdrop1.3.29+textdir/Makefile.in
--- eggdrop1.3.29/Makefile.in	Fri Oct  8 22:46:55 1999
+++ eggdrop1.3.29+textdir/Makefile.in	Fri Oct  8 23:54:11 1999
@@ -204,11 +204,20 @@
 	@if test -r $(DEST)/eggdrop; then \
 		rm -f $(DEST)/oeggdrop; \
 	fi
-	@if test ! -r $(DEST)/motd; then \
-		$(CP1) motd $(DEST)/; \
+	@if test ! -d $(DEST)/logs; then \
+		echo Creating logs subdirectory.; \
+		mkdir $(DEST)/logs; \
+		$(CP1) logs/CONTENTS $(DEST)/logs/; \
 	fi
-	@if test ! -r $(DEST)/telnet-banner; then \
-		$(CP1) telnet-banner $(DEST)/; \
+	@if test ! -d $(DEST)/text; then \
+		echo Creating text subdirectory.; \
+		mkdir $(DEST)/text; \
+	fi
+	@if test ! -r $(DEST)/text/motd; then \
+		$(CP1) text/motd $(DEST)/text/; \
+	fi
+	@if test ! -r $(DEST)/text/banner; then \
+		$(CP1) text/banner $(DEST)/text/; \
 	fi
 	@if test -h $(DEST)/modules; then \
 		echo Removing symlink to archival modules directory.; \
diff -urN eggdrop1.3.29/doc/UPDATES1.3 eggdrop1.3.29+textdir/doc/UPDATES1.3
--- eggdrop1.3.29/doc/UPDATES1.3	Fri Oct  8 22:46:55 1999
+++ eggdrop1.3.29+textdir/doc/UPDATES1.3	Fri Oct  8 23:54:11 1999
@@ -4,6 +4,9 @@
 
 1.3.29
 Foundby   Fixedby   What....
+          rtc       reintroduced the text/-dir, renamed telnet-banner to
+                    banner, set default config filename to eggdrop.conf,
+                    put logfiles to logs/-dir by default
           dw        kicks weren't being logged
           rtc       added assert debugging feature
 	  Fabian    main() wasn't removing unknown sockets correctly
diff -urN eggdrop1.3.29/doc/eggdrop.doc eggdrop1.3.29+textdir/doc/eggdrop.doc
--- eggdrop1.3.29/doc/eggdrop.doc	Fri Oct  8 22:46:55 1999
+++ eggdrop1.3.29+textdir/doc/eggdrop.doc	Fri Oct  8 23:08:30 1999
@@ -121,7 +121,7 @@
     upgrading to a new version is somewhat painless.  You can put your
     config file and user file in that directory, and then when you
     compile a new version of eggdrop, you just have to do:
-       putegg <directory>
+       ./configure --prefix=<directory>; make install
     and it will copy eggdrop, weed, and optionally the help files.
 
     The config file that comes with eggdrop is called "eggdrop.conf.dist".
diff -urN eggdrop1.3.29/eggdrop.conf.dist eggdrop1.3.29+textdir/eggdrop.conf.dist
--- eggdrop1.3.29/eggdrop.conf.dist	Fri Oct  8 22:46:55 1999
+++ eggdrop1.3.29+textdir/eggdrop.conf.dist	Fri Oct  8 23:33:03 1999
@@ -98,9 +98,9 @@
 
 # in 'eggdrop.log' put private msgs/ctcps, commands, misc info, and
 # errors from any channel:
-logfile mco * "eggdrop.log"
+logfile mco * "logs/eggdrop.log"
 # in 'lame.log' put joins, parts, kicks, bans, and mode changes from #lamest:
-logfile jk #lamest "lamest.log"
+logfile jk #lamest "logs/lamest.log"
 
 # [0/1] timestamp entries in the log file? (generally a good idea)
 set log-time 1
@@ -148,10 +148,10 @@
 
 # the MOTD is displayed when people dcc chat to the bot.
 # type '.help set motd' in DCC CHAT for tons of motd options.
-set motd "motd"
+set motd "text/motd"
 
 # holds the banner displayed on telnet connections
-set telnet-banner "telnet-banner"
+set telnet-banner "text/banner"
 
 
 #####  BOTNET  #####
diff -urN eggdrop1.3.29/language/core.english.lang eggdrop1.3.29+textdir/language/core.english.lang
--- eggdrop1.3.29/language/core.english.lang	Fri Oct  8 22:46:55 1999
+++ eggdrop1.3.29+textdir/language/core.english.lang	Fri Oct  8 23:06:10 1999
@@ -274,7 +274,7 @@
   -c   (with -n) display channel stats every 10 seconds\n\
   -t   (with -n) use terminal to simulate dcc-chat\n\
   -m   userfile creation mode\n\
-  optional config filename (default 'egg.config')\n
+  optional config filename (default 'eggdrop.conf')\n
 
 0x701,I detect %s already running from this directory.\n
 0x702,If this is incorrect, erase the '%s'\n
diff -urN eggdrop1.3.29/language/core.french.lang eggdrop1.3.29+textdir/language/core.french.lang
--- eggdrop1.3.29/language/core.french.lang	Fri Oct  8 22:46:55 1999
+++ eggdrop1.3.29+textdir/language/core.french.lang	Fri Oct  8 23:06:22 1999
@@ -275,7 +275,7 @@
   -c   (avec -n) j'?cris les statitstiques du canal toutes les 10 secondes\n\
   -t   (avec -n) utilise un terminal pour simuler un DCC-CHAT\n\
   -m   mode de cr?ation du fichier usager\n\
-  nom de fichier de configuration (optionnel) (par defaut 'egg.config')\n
+  nom de fichier de configuration (optionnel) (par defaut 'eggdrop.conf')\n
 
 0x701,Je d?tecte que %s est d?ja en train de s'ex?cuter depuis ce r?pertoire.\n
 0x702,Si ce n'est pas le cas, supprimez '%s'\n
diff -urN eggdrop1.3.29/language/core.german.lang eggdrop1.3.29+textdir/language/core.german.lang
--- eggdrop1.3.29/language/core.german.lang	Fri Oct  8 22:46:55 1999
+++ eggdrop1.3.29+textdir/language/core.german.lang	Fri Oct  8 23:06:31 1999
@@ -257,7 +257,7 @@
   -c   (mit -n) zeige Channelstatistiken alle 10 Sekunden\n\
   -t   (mit -n) benutze Terminal, um einen DCC chat zu simulieren\n\
   -m   Userdatei Erstellungs-Modus\n\
-  optionaler Configdateiname (Standard 'egg.config')\n
+  optionaler Configdateiname (Standard 'eggdrop.conf')\n
 
 0x701,Ich erkenne, da? %s bereits von diesem Verzeichnis l?uft.\n
 0x702,Wenn dies nicht richtig sein sollte, l?sche die '%s'\n
diff -urN eggdrop1.3.29/logs/CONTENTS eggdrop1.3.29+textdir/logs/CONTENTS
--- eggdrop1.3.29/logs/CONTENTS	Thu Jan  1 01:00:00 1970
+++ eggdrop1.3.29+textdir/logs/CONTENTS	Fri Oct  8 23:33:41 1999
@@ -0,0 +1,2 @@
+This is a good place to put your logfiles in.
+
diff -urN eggdrop1.3.29/motd eggdrop1.3.29+textdir/motd
--- eggdrop1.3.29/motd	Fri Oct  8 22:46:55 1999
+++ eggdrop1.3.29+textdir/motd	Thu Jan  1 01:00:00 1970
@@ -1,30 +0,0 @@
-    ____                __ 
-   / __/___ _ ___ _ ___/ /____ ___   ___ 
-  / _/ / _ `// _ `// _  // __// _ \ / _ \   
- /___/ \_, / \_, / \_,_//_/   \___// .__/ 
-      /___/ /___/                 /_/
-           ___    ____   
-          <  /   |_  /  
-          / /_  _/_ < 
-         /_/(_)/____/ (c) Robey Pointer 1997
-
-Hey %b%N!%b  My name is %b%B%b and I am running %b%V%b,
-on %b%U%b.
-
-Local time is now %b%T%b
-%{+n}
-You are an owner of this bot. Only +n users can see this! For more info,
-try %b.help set motd%b (please edit the %bmotd%b file in your bot's directory)
-%{-}
-If you need help with this eggdrop you can go
-to the following help channels:
-
-#eggdrop at Undernet
-#bothelp at Ircnet
-#egghelp at Efnet
-
-try %.help% to get help
-    %.help all% to get the full command list
-    %.help *somestring*% to get the matching help texts
-
-Have fun.
diff -urN eggdrop1.3.29/src/dcc.c eggdrop1.3.29+textdir/src/dcc.c
--- eggdrop1.3.29/src/dcc.c	Fri Oct  8 22:46:57 1999
+++ eggdrop1.3.29+textdir/src/dcc.c	Fri Oct  8 23:01:13 1999
@@ -47,7 +47,7 @@
 int flood_telnet_time = 60;	/* in how many seconds? */
 extern int min_dcc_port, max_dcc_port;	/* valid portrange for telnets */
 extern int par_telnet_flood;    /* trigger telnet flood for +f ppl? */
-char bannerfile[121] = "telnet-banner"; /* file displayed on telnet login */
+char bannerfile[121] = "text/banner"; /* file displayed on telnet login */
 
 static void strip_telnet(int sock, char *buf, int *len)
 {
diff -urN eggdrop1.3.29/src/dccutil.c eggdrop1.3.29+textdir/src/dccutil.c
--- eggdrop1.3.29/src/dccutil.c	Fri Oct  8 22:46:57 1999
+++ eggdrop1.3.29+textdir/src/dccutil.c	Fri Oct  8 23:01:54 1999
@@ -32,7 +32,7 @@
 extern int dcc_flood_thr;
 extern int backgrd;
 
-char motdfile[121] = "motd";	/* file where the motd is stored */
+char motdfile[121] = "text/motd";	/* file where the motd is stored */
 int connect_timeout = 15;	/* how long to wait before a telnet
 				 * connection times out */
 int reserved_port = 0;
diff -urN eggdrop1.3.29/src/main.c eggdrop1.3.29+textdir/src/main.c
--- eggdrop1.3.29/src/main.c	Fri Oct  8 22:46:57 1999
+++ eggdrop1.3.29+textdir/src/main.c	Fri Oct  8 23:03:06 1999
@@ -92,7 +92,7 @@
 				 * stats? */
 int term_z = 0;			/* foreground: use the terminal as a party
 				 * line? */
-char configfile[121] = "egg.config";	/* name of the config file */
+char configfile[121] = "eggdrop.conf";	/* name of the config file */
 char helpdir[121];		/* directory of help files (if used) */
 char textdir[121] = "";		/* directory for text files that get dumped */
 int keep_all_logs = 0;		/* never erase logfiles, no matter how old
diff -urN eggdrop1.3.29/telnet-banner eggdrop1.3.29+textdir/telnet-banner
--- eggdrop1.3.29/telnet-banner	Fri Oct  8 22:46:55 1999
+++ eggdrop1.3.29+textdir/telnet-banner	Thu Jan  1 01:00:00 1970
@@ -1,6 +0,0 @@
-                       _
-  ___   __ _  __ _  __| |_ __  ___  _ __
- / _ \ / _` |/ _` |/ _` | '__|/ _ \| '_ \
-|  __/| (_| | (_| | (_| | |  | (_) | |_) |
- \___| \__, |\__, |\__,_|_|   \___/| .__/
-       |___/ |___/                 |_|     v1.3
diff -urN eggdrop1.3.29/text/CONTENTS eggdrop1.3.29+textdir/text/CONTENTS
--- eggdrop1.3.29/text/CONTENTS	Thu Jan  1 01:00:00 1970
+++ eggdrop1.3.29+textdir/text/CONTENTS	Fri Oct  8 22:59:41 1999
@@ -0,0 +1,8 @@
+banner
+   the contents of this file are displayed whenever a user
+   telnets to the bot before login
+
+motd
+   anytime a user logs in successfully and joins the party line, he
+   is show the text from this file
+
diff -urN eggdrop1.3.29/text/banner eggdrop1.3.29+textdir/text/banner
--- eggdrop1.3.29/text/banner	Thu Jan  1 01:00:00 1970
+++ eggdrop1.3.29+textdir/text/banner	Fri Oct  8 22:28:43 1999
@@ -0,0 +1,6 @@
+                       _
+  ___   __ _  __ _  __| |_ __  ___  _ __
+ / _ \ / _` |/ _` |/ _` | '__|/ _ \| '_ \
+|  __/| (_| | (_| | (_| | |  | (_) | |_) |
+ \___| \__, |\__, |\__,_|_|   \___/| .__/
+       |___/ |___/                 |_|     v1.3
diff -urN eggdrop1.3.29/text/motd eggdrop1.3.29+textdir/text/motd
--- eggdrop1.3.29/text/motd	Thu Jan  1 01:00:00 1970
+++ eggdrop1.3.29+textdir/text/motd	Fri Oct  8 22:28:43 1999
@@ -0,0 +1,30 @@
+    ____                __ 
+   / __/___ _ ___ _ ___/ /____ ___   ___ 
+  / _/ / _ `// _ `// _  // __// _ \ / _ \   
+ /___/ \_, / \_, / \_,_//_/   \___// .__/ 
+      /___/ /___/                 /_/
+           ___    ____   
+          <  /   |_  /  
+          / /_  _/_ < 
+         /_/(_)/____/ (c) Robey Pointer 1997
+
+Hey %b%N!%b  My name is %b%B%b and I am running %b%V%b,
+on %b%U%b.
+
+Local time is now %b%T%b
+%{+n}
+You are an owner of this bot. Only +n users can see this! For more info,
+try %b.help set motd%b (please edit the %bmotd%b file in your bot's directory)
+%{-}
+If you need help with this eggdrop you can go
+to the following help channels:
+
+#eggdrop at Undernet
+#bothelp at Ircnet
+#egghelp at Efnet
+
+try %.help% to get help
+    %.help all% to get the full command list
+    %.help *somestring*% to get the matching help texts
+
+Have fun.


More information about the Patches mailing list