@beplus/be 0.4.0 → 0.6.0

package/bin/be

@@ -64,7 +64,7 @@ function n_grep() {
 # Setup and state
 #
 
-VERSION="v0.4.0"
+VERSION="v0.6.0"
 
 BE_PREFIX="${BE_PREFIX-/usr/local}"
 BE_PREFIX=${BE_PREFIX%/}
@@ -919,10 +919,17 @@ function display_compatible_file_field {
 
 function tarball_url() {
   local version="$1"
+
+  # Full release version (used in GitHub tag / path)
   local url_version="${version//+/%2B}"
-  local ext=gz
+
+  # Artifact version (filename MUST NOT contain +suffix)
+  local artifact_version="${version%%+*}"
+
+  local ext="gz"
   [ "$BE_USE_XZ" = "true" ] && ext="xz"
-  echo "${g_mirror_url}/v${url_version}/beplus-cli-v${url_version}-$(display_tarball_platform).tar.${ext}"
+
+  echo "${g_mirror_url}/v${url_version}/beplus-cli-v${artifact_version}-$(display_tarball_platform).tar.${ext}"
 }
 
 #
@@ -1075,7 +1082,12 @@ function get_latest_resolved_version() {
     g_target_beplus="${simple_version}"
   else
     # Complicated recognising exact version, KISS and lookup.
+    # display_remote_versions lists newest first and may return several matches
+    # (e.g. 'be 1' -> every 1.x); keep the newest as the single install target.
     g_target_beplus=$(display_remote_versions "$version")
+    local status=$?
+    g_target_beplus="${g_target_beplus%%$'\n'*}"
+    return "${status}"
   fi
 }
 
@@ -1128,8 +1140,9 @@ function display_remote_versions() {
     is_exact_numeric_version "${version}" && match_count=1
     # Quote any dots in version so they are literal for expression
     match="${version//\./\.}"
-    # Avoid 1.2 matching 1.23
-    match="^${match}[^0-9]"
+    # Anchor the end so '1' matches v1.x but not v10.x, while an exact
+    # 'v1.2.3' still matches its bare name (which has no trailing separator).
+    match="^${match}([^0-9]|$)"
   else
     abort "invalid version '$1'"
   fi
@@ -1138,12 +1151,10 @@ function display_remote_versions() {
   # local index_url="https://beplus.s3.amazonaws.com/cli/releases.json"
   local index_url="${BE_RELEASE_INDEX_URL:-https://beplus.s3.amazonaws.com/cli/releases.json}"
 
-  for row in $(do_get_index "${index_url}" | jq -r '.[] | @base64'); do
-    _jq() {
-     echo ${row} | base64 --decode | jq -r ${1}
-    }
-   echo $(_jq '.name')
-  done | awk "NR<=${match_count}" \
+  do_get_index "${index_url}" \
+    | jq -r '.[] | .name' \
+    | n_grep -E "${match}" \
+    | awk "NR<=${match_count}" \
     | cut -f 1 \
     | n_grep -E -o '[^v].*'
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@beplus/be",
   "description": "Interactively Manage beplus CLI Versions",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "author": "Igor Lamos <igor@be.plus>",
   "homepage": "https://github.com/beplus/be",
   "bugs": "https://github.com/beplus/be",