X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mjo-overlay.git;a=blobdiff_plain;f=eclass%2Fsys-user.eclass;h=37c4d8719ac82cce8bec5a42b3f830c9ed5ba682;hp=8f32c2308fbbf1db1d0857c9a2b67522c9f074cf;hb=42b11c0d223b3cbdd2a3878375b54bedd66fc46b;hpb=a9b4878da992e972a2b2ea95e7540db9e3d7eaa4

diff --git a/eclass/sys-user.eclass b/eclass/sys-user.eclass
index 8f32c23..37c4d87 100644
--- a/eclass/sys-user.eclass
+++ b/eclass/sys-user.eclass
@@ -12,11 +12,11 @@
 # Needed for egetshell and egethome.
 inherit user
 
-EXPORT_FUNCTIONS pkg_pretend src_unpack src_configure src_compile src_install src_test pkg_preinst pkg_postinst pkg_prerm
+EXPORT_FUNCTIONS pkg_pretend src_unpack src_configure src_compile src_install src_test pkg_preinst pkg_prerm
 
-: ${HOMEPAGE:="https://www.gentoo.org/"}
+: ${HOMEPAGE:="https://wiki.gentoo.org/wiki/User:Mjo/GLEP:User_packages"}
 : ${DESCRIPTION:="The ${PN} system user"}
-: ${LICENSE:="GPL-2"}
+: ${LICENSE="GPL-2"}
 
 # If you want a different username, use a different package name. This
 # prevents different people from claiming the same username.
@@ -83,7 +83,7 @@ sys-user_getuid() {
 	# Output the real UID of the given user, or the empty string if the
 	# user does not exist on the system.
 	[[ $# -eq 1 ]] || die "usage: sys-user_getuid <username>"
-	echo $(id --real --user "${1}")
+	echo $(id --real --user "${1}" 2>/dev/null)
 }
 
 sys-user_getname() {
@@ -132,22 +132,20 @@ sys-user_modify() {
 
 sys-user_pkg_pretend() {
 	# Sanity checks that would otherwise run code in global scope.
-
-	# Next ensure that no other username owns an important UID.
 	if [[ "${SYS_USER_UID_IMPORTANT}" == "true" ]]; then
-		# Ok, the UID is important. Make sure nobody else has it. Or
+
+		# The UID is important, so make sure nobody else has it. Or
 		# rather, nobody else *with a different username* has it.
 		local oldname=$(sys-user_getname "${SYS_USER_UID}")
-		if [[ "${SYS_USER_NAME}" != "${oldname}" ]]; then
+		if [[ -n "${oldname}" ]] && \
+			   [[ "${SYS_USER_NAME}" != "${oldname}" ]]; then
 			die "important UID ${SYS_USER_UID} already belongs to ${oldname}"
 		fi
-	fi
 
-	# Finally, ensure that this username doesn't already exist with
-	# another UID if its UID is supposedly important.
-	local olduid=$(sys-user_getuid "${SYS_USER_NAME}")
-	if [[ -n "${olduid}" ]]; then
-		if [[ "${SYS_USER_UID_IMPORTANT}" == "true" ]] && \
+		# Ensure that this username doesn't already exist with another
+		# UID if its UID is supposedly important.
+		local olduid=$(sys-user_getuid "${SYS_USER_NAME}")
+		if [[ -n "${olduid}" ]] && \
 			   [[ "${SYS_USER_UID}" != "${olduid}" ]]; then
 			# The UID is important and specified, but there is already a
 			# system user with this name and a different UID. Halp.
@@ -225,11 +223,10 @@ sys-user_pkg_preinst() {
 		# and create the (new) user.
 		sys-user_create || die "failed to add user ${SYS_USER_NAME}"
 	elif [[ -n "${REPLACING_VERSIONS}" ]]; then
-		#
-		# This case is done in pkg_postint() to avoid clobbering a
-		# new user when we remove the old one.
-		#
-		:
+	   # This is an upgrade from a previous version of a sys-user
+	   # package. Modify the existing user (who will not be removed; see
+	   # sys-user_pkg_prerm) rather than creating a new one.
+		sys-user_modify || die "failed to upgrade user ${SYS_USER_NAME}"
 	else
 		# UPGRADE PATH: Ok, the user exists but this isn't an upgrade of
 		# a sys-user package. This is the upgrade path from the old
@@ -266,35 +263,25 @@ sys-user_pkg_preinst() {
 	fi
 }
 
-sys-user_pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-	   # This is an upgrade from a previous version of a sys-user
-	   # package. This case has to be handled carefully to make sure
-	   # that the pkg_prerm() of the old version doesn't remove the user
-	   # that this new version is going to add. At this point, in our
-	   # pkg_postinst(), the old version's pkg_prerm() phase should have
-	   # already happened.
-	   if [[ -n $(sys-user_getuid "${SYS_USER_NAME}") ]]; then
-		   die "User ${SYS_USER_NAME} already exists during an upgrade."
-	   else
-		   sys-user_modify || die "failed to add user ${SYS_USER_NAME}"
-	   fi
-	fi
-}
 
 sys-user_pkg_prerm() {
 	if [[ -z $(sys-user_getuid "${SYS_USER_NAME}") ]]; then
 		# We have successfully done nothing.
 		ewarn "Tried to remove nonexistent user ${SYS_USER_NAME}."
 	elif [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# The user to remove exists, and this is not an upgrade, so
-		# we really do remove him.
-		userdel "${SYS_USER_NAME}" || \
-			die "failed to remove user ${SYS_USER_NAME}"
-		einfo "Removed user ${SYS_USER_NAME} from the system."
+		# The user to remove exists, and this is not an upgrade. For
+		# Phase 1, we maintain the status quo and simply refuse to
+		# remove him (unless you know what you are doing).
+		if [[ "${I_KNOW_WHAT_I_AM_DOING}" == "yes" ]]; then
+			userdel "${SYS_USER_NAME}" || \
+				die "failed to remove user ${SYS_USER_NAME}"
+			einfo "Removed user ${SYS_USER_NAME} from the system."
+		else
+			die "refusing to remove package for system user ${SYS_USER_NAME}"
+		fi
 
-		# The missing case: if the user exista and this is an upgrade,
+		# The missing case: if the user exists and this is an upgrade,
 		# we leave the user alone to be modified in
-		# sys-user_pkg_postinst().
+		# sys-user_pkg_preinst().
 	fi
 }