socsvn commit: r237124 - soc2012/tzabal/client-side/akcrs-head/usr.sbin/crashreport

[tzabal at FreeBSD.org]

Author: tzabal
Date: Tue Jun  5 11:04:58 2012
New Revision: 237124
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237124

Log:
  Updated version of crashreport. Include a section of the patch (about email checking) that I did not have in my last commit.

Modified:
  soc2012/tzabal/client-side/akcrs-head/usr.sbin/crashreport/crashreport.sh

Modified: soc2012/tzabal/client-side/akcrs-head/usr.sbin/crashreport/crashreport.sh
==============================================================================
--- soc2012/tzabal/client-side/akcrs-head/usr.sbin/crashreport/crashreport.sh	Tue Jun  5 10:23:41 2012	(r237123)
+++ soc2012/tzabal/client-side/akcrs-head/usr.sbin/crashreport/crashreport.sh	Tue Jun  5 11:04:58 2012	(r237124)
@@ -117,13 +117,13 @@
 
 ## Find the email that will be used for contact
 if [ -z "${_email}" ]; then
-	# email of /etc/rc.conf
-	_email="${email}"
-fi
-
-if [ -z "${_email}" ]; then
-	error 'No email address for contact is specified.'
-	exit 6
+	if [ -n "${email}" ]; then
+		# email of /etc/rc.conf
+		_email="${email}"
+	else
+		error 'No email address for contact is specified.'
+		exit 6
+	fi
 fi
 
 # Check if the given email address is valid based on its format.