Release 0.1.3

Author: skrcode

install.sh

@@ -93,11 +93,23 @@ resolve_latest_version() {
   strip_v "$version"
 }
 
+resolve_version_from_archive_url() {
+  [ -n "$ARCHIVE_URL" ] || return 1
+  archive_name=$(printf '%s\n' "$ARCHIVE_URL" | sed 's#^.*\/##; s/[?#].*$//')
+  version=$(printf '%s\n' "$archive_name" | sed -n 's/^jaipilot-\([0-9][0-9.]*\)-.*\.tar\.gz$/\1/p')
+  [ -n "$version" ] || return 1
+  printf '%s\n' "$version"
+}
+
 resolve_version() {
   if [ -n "$VERSION" ]; then
     printf '%s\n' "$VERSION"
     return
   fi
+  if version=$(resolve_version_from_archive_url); then
+    printf '%s\n' "$version"
+    return
+  fi
   resolve_latest_version
 }
 

scripts/smoke-test-install.sh

@@ -96,13 +96,16 @@ fi
 [ -n "${TAR_GZ:-}" ] || die "Could not find a JAIPilot tar.gz distribution under $DIST_DIR"
 [ -f "$TAR_GZ" ] || die "Missing distribution archive: $TAR_GZ"
 CHECKSUM_FILE="$TAR_GZ.sha256"
+INSTALL_VERSION=${VERSION:-$(basename "$TAR_GZ" | sed -n "s/^jaipilot-\\([0-9][0-9.]*\\)-$RESOLVED_CLASSIFIER\\.tar\\.gz$/\\1/p")}
+[ -n "${INSTALL_VERSION:-}" ] || die "Could not determine the distribution version from $TAR_GZ"
 
 printf '%s  %s\n' "$(compute_sha256 "$TAR_GZ")" "$(basename "$TAR_GZ")" > "$CHECKSUM_FILE"
 
 rm -rf "$SMOKE_DIR"
 mkdir -p "$SMOKE_DIR"
 
 "$REPO_ROOT/install.sh" \
+  --version "$INSTALL_VERSION" \
   --archive-url "file://$TAR_GZ" \
   --checksum-url "file://$CHECKSUM_FILE" \
   --bin-dir "$SMOKE_DIR/bin" \

src/main/java/com/jaipilot/cli/update/UpdateService.java

@@ -114,7 +114,7 @@ public UpdateInstallResult installVersion(String version, Duration timeout) {
                         "Self-update is only available for JAIPilot installs managed by the installer."
                 ));
 
-        String currentVersion = VersionComparator.normalize(JaiPilotVersionProvider.resolveVersion());
+        String currentVersion = resolveInstalledVersion(installation);
         String targetVersion = VersionComparator.normalize(version);
 
         if (!installation.legacyLayout() && VersionComparator.compare(currentVersion, targetVersion) == 0) {
@@ -186,6 +186,16 @@ private void downloadAndInstall(InstallationLayout installation, String version,
         }
     }
 
+    private String resolveInstalledVersion(InstallationLayout installation) {
+        if (installation != null && !installation.legacyLayout()) {
+            Path payloadDir = installation.activePayloadDir();
+            if (payloadDir != null && payloadDir.getFileName() != null) {
+                return VersionComparator.normalize(payloadDir.getFileName().toString());
+            }
+        }
+        return VersionComparator.normalize(JaiPilotVersionProvider.resolveVersion());
+    }
+
     private String resolvePlatform() {
         return resolveOs() + "-" + resolveArch();
     }

src/test/java/com/jaipilot/cli/update/UpdateServiceTest.java

@@ -67,6 +67,7 @@ void installVersionIsNoOpWhenAlreadyCurrentOnVersionedLayout() throws Exception
 
         assertFalse(result.changed());
         assertFalse(result.migratedLegacyLayout());
+        assertEquals("0.1.2", result.previousVersion());
         assertEquals("0.1.2", result.installedVersion());
     }