From a9d49da787aa98550fcbc0768f94b1b9f4f0542e Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Fri, 1 Jul 2016 00:17:46 +0200
Subject: [PATCH] beesh: fix parsing of PKGFULLNAME and PKGFULLVERSION when
 modified in bee file.

This fixes the case, when the updated PKGFULLNAME or PKGFULLVERSION do
not contain an EXTRA with underscore.
---
 src/beesh.sh.in | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/beesh.sh.in b/src/beesh.sh.in
index 7231b61..c4788b4 100644
--- a/src/beesh.sh.in
+++ b/src/beesh.sh.in
@@ -729,7 +729,11 @@ function verify_new_package_variables() {
             exit 1
         fi
         PKGNAME=${PKGFULLNAME//_*}
-        PKGEXTRANAME=${PKGFULLNAME#*_}
+        if [ "$PKGNAME" = "$PKGFULLNAME" ] ; then
+            PKGEXTRANAME=""
+        else
+            PKGEXTRANAME=${PKGFULLNAME#*_}
+        fi
     fi
     PKGFULLNAME="${PKGNAME}${PKGEXTRANAME:+_${PKGEXTRANAME}}"
 
@@ -740,7 +744,11 @@ function verify_new_package_variables() {
             exit 1
         fi
         PKGVERSION=${PKGFULLVERSION//_*}
-        PKGEXTRAVERSION=${PKGFULLVERSION#*_}
+        if [ "$PKGVERSION" = "$PKGFULLVERSION" ] ; then
+            PKGEXTRAVERSION=""
+        else
+            PKGEXTRAVERSION=${PKGFULLVERSION#*_}
+        fi
     fi
     PKGFULLVERSION="${PKGVERSION}${PKGEXTRAVERSION:+_${PKGEXTRAVERSION}}"
 }