From 5fa6651a253ce9f74072d73851bcdfb248cd4d8c 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 1/2] 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 76e9ade..843ad09 100644
--- a/src/beesh.sh.in
+++ b/src/beesh.sh.in
@@ -741,7 +741,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}}"
 
@@ -752,7 +756,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}}"
 }

From 1c7c338e152ba80f49ca909cc2c1cabb104ea7ca Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Fri, 1 Jul 2016 14:25:54 +0200
Subject: [PATCH 2/2] beesh: fix search for free revison number

---
 src/beesh.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/beesh.sh.in b/src/beesh.sh.in
index 843ad09..b7b91c5 100644
--- a/src/beesh.sh.in
+++ b/src/beesh.sh.in
@@ -152,7 +152,7 @@ function check_rebuild() {
     beefile_pattern=${beefile_pattern//+/\\+} # replace all + with \+
     beefile_pattern=${beefile_pattern//./\\.} # replace all . with \.
 
-    beefile_max=$(for bf in $(ls "${beefile%/*}/${beefile_pattern}*.bee" "${BEE_BEEDIR}/${beefile_pattern}*.bee" 2>/dev/null |\
+    beefile_max=$(for bf in $(ls ${beefile%/*}/${beefile_pattern}*.bee ${BEE_BEEDIR}/${beefile_pattern}*.bee 2>/dev/null |\
                               grep -E "/${beefile_pattern}-[0-9]+.bee") ; do
                       echo "${bf}"
                   done | ${BEESORT} | tail -1)