Merge pull request #12 from mariux64/fixes

Add fixes
mariux64 · Aug 19, 2016 · 89427b1 · 89427b1
2 parents 768565e + a9c9f19
commit 89427b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git 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"
@@ -998,7 +992,7 @@ config_export
 
 ###############################################################################
 
-check_rebuild "${BEE}" "${PKGALLPKG}"
+check_rebuild "${BEE%/*}/${PKGFULLPKG}.bee" "${PKGALLPKG}"
 
 print_info "current working directory: ${PWD}"
 

diff --git 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)