Add patches to prevent multibyte encoded strings to be garbaged.

(already submitted to the author)

Add user & group in package building too.

Submitted by:	bento

Remove user & group on deinstallation (only on bento).

1 files changed, 28 insertions, 22 deletions

diff --git a/irc/dancer-services/pkg-install b/irc/dancer-services/pkg-install
index 6f75b09f8220..1e5fa254857c 100644
--- a/irc/dancer-services/pkg-install
+++ b/irc/dancer-services/pkg-install
@@ -12,7 +12,7 @@ ask() {
 
 	question=$1
 	default=$2
-	if [ -z "${PACKAGE_BUILDING}" ]; then
+	if [ -z "${BATCH}" ]; then
 		read -p "${question} [${default}]? " answer
 	fi
 	if [ x${answer} = x ]; then
@@ -36,9 +36,7 @@ yesno() {
 	done
 }
 
-if which -s pw ; then
-	:
-else
+if ! which -s pw ; then
 	cat <<EOF
 Your system does not include the "pw" utility.  You should upgrade
 to a newer version of FreeBSD.  Without "pw" this script will not
@@ -47,42 +45,50 @@ EOF
 	exit 1
 fi
 
+uid=73
+user=ircservices
+gid=$uid
+group=$user
+gecos="IRC services" 
+shell=/nonexistent
+home=/nonexistent
+
 echo ""
-if pw groupshow ircservices 2> /dev/null ; then
-	echo "You already have a group \"ircservices\", so I will use it."
+if pw groupshow $group 2> /dev/null ; then
+	echo "You already have a group \"$group\", so I will use it."
 else
-	if pw groupshow 73 2> /dev/null ; then
-		echo "You already have a gid \"73\".  Please create a user \"ircservices\""
-		echo "with a default group of \"ircservices\"."
+	if pw groupshow $gid 2> /dev/null ; then
+		echo "You already have a gid \"$gid\".  Please create a user \"$group\""
+		echo "with a default group of \"$group\"."
 		exit 1
 	fi
-	echo "You need a group \"ircservices\"."
+	echo "You need a group \"$group\"."
 	if which -s pw && yesno "Would you like me to create it" y; then
-		pw groupadd ircservices -g 73 || exit
+		pw groupadd $group -g $gid || exit
 		echo "Done."
 	else
 		echo "Please create it, and try again."
-		if ! pw usershow ircservices 2> /dev/null ; then
-			echo "While you're at it, please create a user \"ircservices\""
-			echo 'too, with a default group of "ircservices".'
+		if ! pw usershow $user 2> /dev/null ; then
+			echo "While you're at it, please create a user \"$user\""
+			echo 'too, with a default group of "$group".'
 		fi
 		exit 1
 	fi
 fi
 
-if pw usershow ircservices 2> /dev/null ; then
-	echo "You already have a user \"ircservices\", so I will use it."
+if pw usershow $user 2> /dev/null ; then
+	echo "You already have a user \"$user\", so I will use it."
 else
-        if pw usershow 73 2> /dev/null ; then
-                echo "You already have a uid \"73\".  Please create a user \"irc
+        if pw usershow $uid 2> /dev/null ; then
+                echo "You already have a uid \"$uid\".  Please create a user \"irc
 d\""
-                echo "with a default group of \"ircservices\"."
+                echo "with a default group of \"$group\"."
                 exit 1
         fi
-	echo "You need a user \"ircservices\"."
+	echo "You need a user \"$user\"."
 	if which -s pw && yesno "Would you like me to create it" y; then
-		pw useradd ircservices -g ircservices -u 73 -h - -d /nonexistent \
-			-s /nonexistent -c "IRC Services" || exit
+		pw useradd $user -g $group -u $uid -h - -d $home \
+			-s $shell -c "$gecos" || exit
 		echo "Done."
 	else
 		echo "Please create it, and try again."