Merge branch 'fixes'

* fixes:
  beesh: fix search for free revison number
  beesh: fix parsing of PKGFULLNAME and PKGFULLVERSION when modified in bee file.

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)
@@ -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}}"
 }