[Pkg-sks-commit] r35 - sks/trunk/sks/debian

[chrism at alioth.debian.org]

Author: chrism
Date: 2008-06-19 14:37:32 +0000 (Thu, 19 Jun 2008)
New Revision: 35

Modified:
   sks/trunk/sks/debian/postinst
Log:
[project @ 36]
updates

Original author: fabbione
Date: 2003-12-03 00:05:18.092335+00:00

Modified: sks/trunk/sks/debian/postinst
===================================================================
--- sks/trunk/sks/debian/postinst	2008-06-19 14:37:26 UTC (rev 34)
+++ sks/trunk/sks/debian/postinst	2008-06-19 14:37:32 UTC (rev 35)
@@ -5,8 +5,8 @@
 # this is ugly but it works around a silly problem of grep
 # exits code.
 
-uid=`getent passwd | grep "^debian-sks:" | cut -d ":" -f 3`
-home=`getent passwd | grep "^debian-sks:" | cut -d ":" -f 6`
+uid=`getent passwd debian-sks | cut -d ":" -f 3`
+home=`getent passwd debian-sks | cut -d ":" -f 6`
 
 # if there is the uid the account is there and we can do
 # the sanit(ar)y checks otherwise we can safely create it.
@@ -14,18 +14,21 @@
 if [ "$uid" ]; then
     # guess??? the checks!!!
     if [ $uid -ge 100 ] && [ $uid -le 999 ]; then
-	if [ "$home" != "/var/lib/sks" ]; then
-	    echo "ERROR: debian-sks account has an invalid home directory!"
-	    echo "Please check /usr/share/doc/sks/README.Debian on how to"
-	    echo "correct this problem"
-	    exit 1
-	fi
+    	echo "debian-sks uid check: ok"
     else
     	echo "ERROR: debian-sks account has a non-system uid!"
 	echo "Please check /usr/share/doc/sks/README.Debian on how to"
 	echo "correct this problem"
 	exit 1
     fi
+    if [ "$home" = "/var/lib/sks" ]; then
+        echo "debian-sks homedir check: ok"
+    else
+	echo "ERROR: debian-sks account has an invalid home directory!"
+	echo "Please check /usr/share/doc/sks/README.Debian on how to"
+	echo "correct this problem"
+	exit 1
+    fi
 else
     # what this might mean?? oh creating a system l^Huser!
     adduser --quiet \