From 6f7f7446349ca07f246fd6ee74f859114d802c9f Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Tue, 26 Jul 2016 15:30:08 +0200
Subject: [PATCH] Improve e-mail detection

---
 src/deforaos-package.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/deforaos-package.sh b/src/deforaos-package.sh
index 7a77300..3dcb676 100755
--- a/src/deforaos-package.sh
+++ b/src/deforaos-package.sh
@@ -93,7 +93,7 @@ _deforaos_package()
 	[ -n "$METHOD" ] || METHOD=$(_package_guess_method)
 	[ -n "$LICENSE" ] || _package_guess_license
 	_package_guess_dependencies
-	[ -n "$EMAIL" ] || _package_guess_email
+	[ -n "$EMAIL" ] || EMAIL=$(_package_guess_email)
 	[ -n "$FULLNAME" ] || _package_guess_fullname
 
 	#call the proper packaging function
@@ -188,10 +188,15 @@ _package_guess_email()
 
 	case "$scm" in
 		git)
-			EMAIL=$($GIT config user.email)
+			$GIT config user.email			|| return 2
+			return 0
 			;;
 	esac
-	[ -n "$EMAIL" ] || EMAIL="$USER@$DOMAIN"
+	if [ -n "$EMAIL" ]; then
+		echo "$EMAIL"
+	else
+		echo "$USER@$DOMAIN"
+	fi
 }
 
 _package_guess_fullname()