Revision bump for an updated patchset. Only change is the removal of the longer handles patch, because it breaks linking with other bots that are not patched, bug 86579. Rewrote the eggdrop-installer script.

(Portage version: 2.0.51.19)

3 files changed, 19 insertions, 19 deletions

diff --git a/net-irc/eggdrop/files/digest-eggdrop-1.6.17-r1 b/net-irc/eggdrop/files/digest-eggdrop-1.6.17-r1
deleted file mode 100644
index b612d981bddc..000000000000
--- a/net-irc/eggdrop/files/digest-eggdrop-1.6.17-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 95b3744a45ac1420cf08d88ee0ed0b6c eggdrop1.6.17.tar.gz 1021902
-MD5 b043e0e1903a0b93e3d58b0a7996b94e eggdrop-1.6.17-patches-1.1.tar.bz2 320876
diff --git a/net-irc/eggdrop/files/digest-eggdrop-1.6.17-r2 b/net-irc/eggdrop/files/digest-eggdrop-1.6.17-r2
new file mode 100644
index 000000000000..8c1a4c1d5518
--- /dev/null
+++ b/net-irc/eggdrop/files/digest-eggdrop-1.6.17-r2
@@ -0,0 +1,2 @@
+MD5 95b3744a45ac1420cf08d88ee0ed0b6c eggdrop1.6.17.tar.gz 1021902
+MD5 46fbe146c406bd2fb49d25a3c7edd494 eggdrop-1.6.17-patches-1.2.tar.bz2 320542
diff --git a/net-irc/eggdrop/files/eggdrop-installer b/net-irc/eggdrop/files/eggdrop-installer
index 40aa75d90c33..604b4b9ae6fe 100644
--- a/net-irc/eggdrop/files/eggdrop-installer
+++ b/net-irc/eggdrop/files/eggdrop-installer
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/files/eggdrop-installer,v 1.8 2004/09/12 15:31:46 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/eggdrop/files/eggdrop-installer,v 1.9 2005/04/03 20:58:39 swegener Exp $
 
 source /etc/init.d/functions.sh || {
 	echo "${0}: Could not source /etc/init.d/functions.sh!"
@@ -10,19 +10,14 @@ source /etc/init.d/functions.sh || {
 
 # Checks to see if user is trying to install eggdrop as root.
 root_check() {
-	einfo "Installing Eggdrop"
-	einfo
-
-	if [ "${HOME}" = "/root" ] || [ "$(whoami)" == "root" ]
+	if [ "${HOME}" = "/root" ] || [ "$(whoami)" = "root" ]
 	then
-		einfo "You should not be installing eggdrop as root."
-		einfo
-		einfo "Installing eggdrop as root leaves your computer vulnerable"
-		einfo "to attack from other irc clients. Please use the eggdrop-installer"
-		einfo "script as the user who you wish to run eggdrop with"
+		ewarn "You should not be installing eggdrop as root."
+		ewarn
+		ewarn "Installing eggdrop as root leaves your computer vulnerable"
+		ewarn "to attack from other irc clients. Please use the eggdrop-installer"
+		ewarn "script as the user who you wish to run eggdrop with"
 		exit 1
-	else
-		install_eggdrop
 	fi
 }
 
@@ -36,8 +31,12 @@ USAGE_END
 	exit 1
 }
 
+# Install eggdrop
 install_eggdrop() {
-	bot_dir="${HOME}/.eggdrop/${bot_name}"
+	einfo "Installing Eggdrop"
+	einfo
+
+	root_check
 
 	if [ -d "${bot_dir}" ]
 	then
@@ -45,7 +44,7 @@ install_eggdrop() {
 		exit 1
 	fi
 
-	einfo "Creating directories for your ${bot_name}..."
+	einfo "Creating directories for your eggdrop..."
 	for dir in logs filesys/incoming text tmp scripts var
 	do
 		mkdir -p "${bot_dir}/${dir}"
@@ -75,10 +74,11 @@ install_eggdrop() {
 	einfo "eggdrop website at http://www.egghelper.org/"
 }
 
-if [ ! -n "${1}" ]
+if [ -z "${1}" ]
 then
 	usage
 else
 	bot_name="${1}"
-	root_check
+	bot_dir="${HOME}/.eggdrop/${bot_name}"
+	install_eggdrop
 fi