X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=packaging%2Ffreebsd%2Fpkg-install;h=5e520cdfd20ad8a19f5b8f7c8e0dd1df39b0fb80;hb=37c5b03dbe70f8f3fe24d15318645e1678841879;hp=940b7963eee074937e91fc6734e09bc35f457ddc;hpb=52301633710bda1bd36fe405dedee386554894b2;p=monkeysphere.git

diff --git a/packaging/freebsd/pkg-install b/packaging/freebsd/pkg-install
index 940b796..5e520cd 100755
--- a/packaging/freebsd/pkg-install
+++ b/packaging/freebsd/pkg-install
@@ -24,7 +24,7 @@ POST-INSTALL)
         GID=${UID}
         SHELL=/usr/local/bin/bash
 
-        if pw group show "${GROUP}" 2>/dev/null; then
+        if pw group show "${GROUP}" >/dev/null 2>&1; then
                 echo "You already have a group \"${GROUP}\", so I will use it."
         else
                 if pw groupadd ${GROUP} -g ${GID}; then
@@ -35,7 +35,8 @@ POST-INSTALL)
                 fi
         fi
 
-        if oldshell=`pw user show "${USER}" 2>/dev/null`; then
+	if pw user show "${USER}" >/dev/null 2>&1; then
+            oldshell=`pw user show "${USER}" 2>/dev/null | cut -f10 -d:`
 	    if [ x"$oldshell" != x"$SHELL" ]; then
 		echo "You already have a \"${USER}\" user, but its shell is '$oldshell'."
 		echo "This package requires that \"${USER}\"'s shell be '$SHELL'."