1.8.3 / 2022-11-03

================== * Fix `m ls` error * Correct some overly generous release version matches
aheckmann · Nov 3, 2022 · cb9efab · cb9efab
1 parent e488983
commit cb9efab
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/History.md b/History.md
@@ -1,3 +1,8 @@
+1.8.3 / 2022-11-03
+==================
+ * Fix `m ls` error
+ * Correct some overly generous release version matches
+
 1.8.2 / 2022-10-03
 ==================
  * `m latest` now outputs correct version

diff --git a/bin/m b/bin/m
@@ -39,7 +39,7 @@ CACHE_SRC=${M_CACHE_SRC:-$M_DIR/cache-src.json}
 CACHE_EXPIRY=${M_CACHE_EXPIRY:-3600}
 
 # m version
-VERSION="1.8.2"
+VERSION="1.8.3"
 
 #
 # Log the given <msg ...>
@@ -595,9 +595,9 @@ install_mongo() {
   debug "CURRENT: $version"
 
   # shorthand for finding latest in a release series (eg: "3.6", "3.6-ent")
-  if [[ $version =~ ^([0-9]\.[0-9]+)(-ent)?$ ]]; then
-    local series="${BASH_REMATCH[1]}"
-    local ent="${BASH_REMATCH[2]}"
+  if [[ $version =~ ^([0-9])\.([0-9]+)(-ent)?$ ]]; then
+    local series="${BASH_REMATCH[1]}\.${BASH_REMATCH[2]}"
+    local ent="${BASH_REMATCH[3]}"
     local all_versions=""
 
     get_all_versions
@@ -1133,9 +1133,9 @@ get_latest_installed_version() {
       ;;
   esac
 
-  if [[ $version =~ ^([0-9]\.[0-9]+)(-ent)?$ ]]; then
-    local series="${BASH_REMATCH[1]}"
-    local ent="${BASH_REMATCH[2]}"
+  if [[ $version =~ ^([0-9)]\.([0-9]+)(-ent)?$ ]]; then
+    local series="${BASH_REMATCH[1]}\.${BASH_REMATCH[2]}"
+    local ent="${BASH_REMATCH[3]}"
     version=`find ${VERSIONS_DIR} -mindepth 1 -maxdepth 1 -type d \
       | egrep -o "$series\.[0-9]+([-_\.]rc[0-9]+)?" \
       | sort -u -k 1,1n -k 2,2n -k 3,3n -t . \
@@ -1293,12 +1293,12 @@ list_versions() {
   check_current_version
   local all_versions=""
 
-  local series="[0-9]+\.[0-9]+"
+  local series="[0-9]\.[0-9]+"
   local rc=""
 
   # match by release series (eg: "3.6")
-  if [[ $version =~ ^([0-9]\.[0-9]+) ]]; then
-    series="${BASH_REMATCH[1]}"
+  if [[ $version =~ ^([0-9])\.([0-9]+) ]]; then
+    series="${BASH_REMATCH[1]}\.${BASH_REMATCH[2]}"
   fi
 
   # Default to stable releases, with option to include RCs
@@ -1310,7 +1310,7 @@ list_versions() {
 
   get_all_versions
 
-  versions=`$all_versions \
+  versions=`echo $all_versions \
     | egrep -o "$series\.[0-9]+$rc" \
     | sort -u \
     | sort -s -k 2.3n -t - \

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "m",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "description": "mongodb version management",
   "homepage": "https://github.com/aheckmann/m",
   "bugs": "https://github.com/aheckmann/m/issues",