don't exit at failure of `pw'. some users prefer having user

`cyrus' in NIS.

Reported by:	nork

10 files changed, 25 insertions, 35 deletions

diff --git a/mail/cyrus-imapd/pkg-deinstall b/mail/cyrus-imapd/pkg-deinstall
index 9604f2773537..308f2d5e49a3 100644
--- a/mail/cyrus-imapd/pkg-deinstall
+++ b/mail/cyrus-imapd/pkg-deinstall
@@ -52,11 +52,10 @@ modify_cyrus_user() {
 	uhome=/nonexistent
 
 	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
-		e=$?
 		echo "*** Failed to update user \`${USER}'."
-		exit ${e}
+	else
+		echo "*** Updated user \`${USER}'."
 	fi
-	echo "*** Updated user \`${USER}'."
 }
 
 case $2 in
diff --git a/mail/cyrus-imapd/pkg-install b/mail/cyrus-imapd/pkg-install
index 9578149d63a6..65cc1470e3d1 100644
--- a/mail/cyrus-imapd/pkg-install
+++ b/mail/cyrus-imapd/pkg-install
@@ -17,11 +17,10 @@ modify_cyrus_user() {
 	uhome=${PKG_PREFIX}/cyrus
 
 	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
-			e=$?
-			echo "*** Failed to update user \`${USER}'."
-			exit ${e}
+		echo "*** Failed to update user \`${USER}'."
+	else
+		echo "*** Updated user \`${USER}'."
 	fi
-	echo "*** Updated user \`${USER}'."
 }
 
 
diff --git a/mail/cyrus-imapd2/pkg-deinstall b/mail/cyrus-imapd2/pkg-deinstall
index 6baee3e9c8e0..79a1e28eead2 100644
--- a/mail/cyrus-imapd2/pkg-deinstall
+++ b/mail/cyrus-imapd2/pkg-deinstall
@@ -42,11 +42,10 @@ modify_cyrus_user() {
 	uhome=/nonexistent
 
 	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
-		e=$?
 		echo "*** Failed to update user \`${USER}'."
-		exit ${e}
+	else
+		echo "*** Updated user \`${USER}'."
 	fi
-	echo "*** Updated user \`${USER}'."
 }
 
 case $2 in
diff --git a/mail/cyrus-imapd2/pkg-install b/mail/cyrus-imapd2/pkg-install
index a4a1d6837d0a..68285b641b88 100644
--- a/mail/cyrus-imapd2/pkg-install
+++ b/mail/cyrus-imapd2/pkg-install
@@ -19,11 +19,10 @@ modify_cyrus_user() {
 	uhome=${PKG_PREFIX}/cyrus
 
 	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
-			e=$?
-			echo "*** Failed to update user \`${USER}'."
-			exit ${e}
+		echo "*** Failed to update user \`${USER}'."
+	else
+		echo "*** Updated user \`${USER}'."
 	fi
-	echo "*** Updated user \`${USER}'."
 }
 
 
diff --git a/mail/cyrus-imapd22/pkg-deinstall b/mail/cyrus-imapd22/pkg-deinstall
index 7374db694789..e0dd1b8bb7fc 100644
--- a/mail/cyrus-imapd22/pkg-deinstall
+++ b/mail/cyrus-imapd22/pkg-deinstall
@@ -41,11 +41,10 @@ modify_cyrus_user() {
 	uhome=/nonexistent
 
 	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
-		e=$?
 		echo "*** Failed to update user \`${USER}'."
-		exit ${e}
+	else
+		echo "*** Updated user \`${USER}'."
 	fi
-	echo "*** Updated user \`${USER}'."
 }
 
 case $2 in
diff --git a/mail/cyrus-imapd22/pkg-install b/mail/cyrus-imapd22/pkg-install
index 556a643fd972..d2ba72f75349 100644
--- a/mail/cyrus-imapd22/pkg-install
+++ b/mail/cyrus-imapd22/pkg-install
@@ -18,11 +18,10 @@ modify_cyrus_user() {
 	uhome=${PKG_PREFIX}/cyrus
 
 	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
-			e=$?
-			echo "*** Failed to update user \`${USER}'."
-			exit ${e}
+		echo "*** Failed to update user \`${USER}'."
+	else
+		echo "*** Updated user \`${USER}'."
 	fi
-	echo "*** Updated user \`${USER}'."
 }
 
 
diff --git a/mail/cyrus-imapd23/pkg-deinstall b/mail/cyrus-imapd23/pkg-deinstall
index 7374db694789..e0dd1b8bb7fc 100644
--- a/mail/cyrus-imapd23/pkg-deinstall
+++ b/mail/cyrus-imapd23/pkg-deinstall
@@ -41,11 +41,10 @@ modify_cyrus_user() {
 	uhome=/nonexistent
 
 	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
-		e=$?
 		echo "*** Failed to update user \`${USER}'."
-		exit ${e}
+	else
+		echo "*** Updated user \`${USER}'."
 	fi
-	echo "*** Updated user \`${USER}'."
 }
 
 case $2 in
diff --git a/mail/cyrus-imapd23/pkg-install b/mail/cyrus-imapd23/pkg-install
index 556a643fd972..d2ba72f75349 100644
--- a/mail/cyrus-imapd23/pkg-install
+++ b/mail/cyrus-imapd23/pkg-install
@@ -18,11 +18,10 @@ modify_cyrus_user() {
 	uhome=${PKG_PREFIX}/cyrus
 
 	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
-			e=$?
-			echo "*** Failed to update user \`${USER}'."
-			exit ${e}
+		echo "*** Failed to update user \`${USER}'."
+	else
+		echo "*** Updated user \`${USER}'."
 	fi
-	echo "*** Updated user \`${USER}'."
 }
 
 
diff --git a/mail/cyrus-imapd24/pkg-deinstall b/mail/cyrus-imapd24/pkg-deinstall
index 7374db694789..e0dd1b8bb7fc 100644
--- a/mail/cyrus-imapd24/pkg-deinstall
+++ b/mail/cyrus-imapd24/pkg-deinstall
@@ -41,11 +41,10 @@ modify_cyrus_user() {
 	uhome=/nonexistent
 
 	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
-		e=$?
 		echo "*** Failed to update user \`${USER}'."
-		exit ${e}
+	else
+		echo "*** Updated user \`${USER}'."
 	fi
-	echo "*** Updated user \`${USER}'."
 }
 
 case $2 in
diff --git a/mail/cyrus-imapd24/pkg-install b/mail/cyrus-imapd24/pkg-install
index 556a643fd972..d2ba72f75349 100644
--- a/mail/cyrus-imapd24/pkg-install
+++ b/mail/cyrus-imapd24/pkg-install
@@ -18,11 +18,10 @@ modify_cyrus_user() {
 	uhome=${PKG_PREFIX}/cyrus
 
 	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
-			e=$?
-			echo "*** Failed to update user \`${USER}'."
-			exit ${e}
+		echo "*** Failed to update user \`${USER}'."
+	else
+		echo "*** Updated user \`${USER}'."
 	fi
-	echo "*** Updated user \`${USER}'."
 }