From 118648c2d80e2c612113076d66e60d4602b31cd7 Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Wed, 20 Jul 2016 13:03:59 +0200
Subject: [PATCH 1/3] beesh: fix search for suggested revision number

This change reduces code, avoids a call to an external programm
and does quoting correctly for all metacharacters

We don't need to restore extglob to its former value, as this
function doesn't return and we are about to exit
---
 src/beesh.sh.in | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/beesh.sh.in b/src/beesh.sh.in
index 03cffcf..b9098ce 100644
--- a/src/beesh.sh.in
+++ b/src/beesh.sh.in
@@ -145,17 +145,11 @@ function check_rebuild() {
 
     print_warning "please increase revision number"
 
-    beefile_dir=${beefile%/*}
     eval $(${BEEVERSION} "${beefile}")
 
     beefile_pattern="${PKGFULLNAME}-${PKGFULLVERSION}"
-    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 |\
-                              grep -E "/${beefile_pattern}-[0-9]+.bee") ; do
-                      echo "${bf}"
-                  done | ${BEESORT} | tail -1)
+    shopt -s extglob
+    beefile_max=$( ls "${beefile%/*}/${beefile_pattern}"-+([0-9]).bee "${BEE_BEEDIR}/${beefile_pattern}"-+([0-9]).bee 2>/dev/null | ${BEESORT} | tail -1)
 
     eval $(${BEEVERSION} ${beefile_max})
     print_warning "cp ${beefile} ${PWD}/${PKGFULLNAME}-${PKGFULLVERSION}-$((PKGREVISION + 1)).bee"

From 269887bd83c99ba352e30936a81eecaf6e84b7af Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Thu, 21 Jul 2016 12:00:10 +0200
Subject: [PATCH 2/3] beeversion: make ends_with return defined value for
 nonsene input

---
 src/beeversion.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/beeversion.c b/src/beeversion.c
index 12c177b..3c83466 100644
--- a/src/beeversion.c
+++ b/src/beeversion.c
@@ -122,6 +122,7 @@ static int ends_with(char *string,char *postfix)
     if (postfix_len<=string_len) {
         return strcmp(&string[string_len-postfix_len],postfix)==0;
     }
+    return 0;
 }
 
 int scan_be0_version(char *filename,struct beeversion *versionsnummer)

From a9c9f19b108da87ca9a2458357ee2a8c2ac36da9 Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Thu, 21 Jul 2016 12:08:45 +0200
Subject: [PATCH 3/3] beesh: verify .bee file doesn't exist for .be0 inputs

---
 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 b9098ce..52391b0 100644
--- a/src/beesh.sh.in
+++ b/src/beesh.sh.in
@@ -992,7 +992,7 @@ config_export
 
 ###############################################################################
 
-check_rebuild "${BEE}" "${PKGALLPKG}"
+check_rebuild "${BEE%/*}/${PKGFULLPKG}.bee" "${PKGALLPKG}"
 
 print_info "current working directory: ${PWD}"