depository-deploy 1.0.4 → 1.0.5

package/install/install-unix.sh

@@ -13,16 +13,45 @@ set -e
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 DEPLOY_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 CONF_FILE="$DEPLOY_DIR/depository.conf"
-# Auto-select platform binaries: macos → release/macos/, linux → release/linux/, fallback → release/
+TEMPLATE_DIR="$SCRIPT_DIR/templates"
+
+# Resolve release binaries directory:
+#  1. DEPOSITORY_RELEASE_DIR env var (set by wizard-server when launching via web UI)
+#  2. Local release/<platform>/ (deploy:all build)
+#  3. Local release/ (single-platform build)
+#  4. npm sibling package: ../depository-deploy-<platform>/release/<platform>/
 OS_TYPE="$(uname -s)"
-if [ "$OS_TYPE" = "Darwin" ] && [ -d "$DEPLOY_DIR/release/macos" ]; then
-  RELEASE_DIR="$DEPLOY_DIR/release/macos"
-elif [ -d "$DEPLOY_DIR/release/linux" ]; then
-  RELEASE_DIR="$DEPLOY_DIR/release/linux"
-else
-  RELEASE_DIR="$DEPLOY_DIR/release"
+PLAT_NAME="linux"
+NPM_PKG="depository-deploy-linux"
+if [ "$OS_TYPE" = "Darwin" ]; then
+  PLAT_NAME="macos"
+  NPM_PKG="depository-deploy-macos"
+fi
+
+RELEASE_DIR=""
+if [ -n "$DEPOSITORY_RELEASE_DIR" ] && [ -d "$DEPOSITORY_RELEASE_DIR" ]; then
+  # Wizard-server passed resolved path
+  if [ -d "$DEPOSITORY_RELEASE_DIR/$PLAT_NAME" ]; then
+    RELEASE_DIR="$DEPOSITORY_RELEASE_DIR/$PLAT_NAME"
+  else
+    RELEASE_DIR="$DEPOSITORY_RELEASE_DIR"
+  fi
+fi
+if [ -z "$RELEASE_DIR" ] || [ ! -d "$RELEASE_DIR" ]; then
+  if [ -d "$DEPLOY_DIR/release/$PLAT_NAME" ]; then
+    RELEASE_DIR="$DEPLOY_DIR/release/$PLAT_NAME"
+  elif [ -d "$DEPLOY_DIR/release" ]; then
+    RELEASE_DIR="$DEPLOY_DIR/release"
+  else
+    # Try npm sibling package (global install layout)
+    NPM_SIBLING="$(dirname "$DEPLOY_DIR")/$NPM_PKG/release/$PLAT_NAME"
+    if [ -d "$NPM_SIBLING" ]; then
+      RELEASE_DIR="$NPM_SIBLING"
+    else
+      RELEASE_DIR="$DEPLOY_DIR/release"
+    fi
+  fi
 fi
-TEMPLATE_DIR="$SCRIPT_DIR/templates"
 
 # ---- Colour helpers ----
 RED='\033[0;31m'; GREEN='\033[0;32m'; YELLOW='\033[1;33m'; NC='\033[0m'

package/install/install-windows.ps1

@@ -13,10 +13,36 @@ $ErrorActionPreference = "Stop"
 $ScriptDir   = Split-Path -Parent $MyInvocation.MyCommand.Path
 $DeployDir   = Split-Path -Parent $ScriptDir
 $ConfFile    = Join-Path $DeployDir "depository.conf"
-# Support both flat release/ (single-platform build) and release/windows/ (deploy:all build)
-$ReleaseDir  = if (Test-Path (Join-Path $DeployDir "release\windows")) { Join-Path $DeployDir "release\windows" } else { Join-Path $DeployDir "release" }
 $TemplateDir = Join-Path $ScriptDir "templates"
 
+# Resolve release binaries directory:
+#  1. DEPOSITORY_RELEASE_DIR env var (set by wizard-server when launching via web UI)
+#  2. Local release/windows/ (deploy:all build)
+#  3. Local release/ (single-platform build)
+#  4. npm sibling package: ../depository-deploy-windows/release/windows/
+$ReleaseDir = $null
+if ($env:DEPOSITORY_RELEASE_DIR -and (Test-Path $env:DEPOSITORY_RELEASE_DIR)) {
+    # Wizard-server passed resolved path — may point to npm platform package
+    $candidate = Join-Path $env:DEPOSITORY_RELEASE_DIR "windows"
+    if (Test-Path $candidate) { $ReleaseDir = $candidate }
+    else { $ReleaseDir = $env:DEPOSITORY_RELEASE_DIR }
+}
+if (-not $ReleaseDir -or -not (Test-Path $ReleaseDir)) {
+    if (Test-Path (Join-Path $DeployDir "release\windows")) {
+        $ReleaseDir = Join-Path $DeployDir "release\windows"
+    } elseif (Test-Path (Join-Path $DeployDir "release")) {
+        $ReleaseDir = Join-Path $DeployDir "release"
+    } else {
+        # Try npm sibling package (global install layout)
+        $npmSibling = Join-Path (Split-Path -Parent $DeployDir) "depository-deploy-windows\release\windows"
+        if (Test-Path $npmSibling) {
+            $ReleaseDir = $npmSibling
+        } else {
+            $ReleaseDir = Join-Path $DeployDir "release"
+        }
+    }
+}
+
 function Write-OK   { param($m) Write-Host "  [OK]   $m" -ForegroundColor Green }
 function Write-Info { param($m) Write-Host "  [INFO] $m" -ForegroundColor Cyan }
 function Write-Warn { param($m) Write-Host "  [WARN] $m" -ForegroundColor Yellow }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "depository-deploy",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Depository document management system – deployment wizard and installers",
   "license": "UNLICENSED",
   "publishConfig": {
@@ -25,9 +25,9 @@
     "scripts/publish.mjs"
   ],
   "optionalDependencies": {
-    "depository-deploy-linux": "1.0.4",
-    "depository-deploy-macos": "1.0.4",
-    "depository-deploy-windows": "1.0.4"
+    "depository-deploy-linux": "1.0.5",
+    "depository-deploy-macos": "1.0.5",
+    "depository-deploy-windows": "1.0.5"
   },
   "scripts": {
     "start": "node wizard-server.mjs"

package/wizard-server.mjs

@@ -176,10 +176,11 @@ const server = createServer((req, res) => {
         const job = { lines: [], done: false, ok: false, subs: new Set() };
         jobs.set(id, job);
 
-        // Spawn installer
+        // Spawn installer — pass resolved RELEASE_DIR so scripts find npm platform binaries
+        const env = { ...process.env, DEPOSITORY_RELEASE_DIR: RELEASE_DIR };
         const proc = isWin
-          ? spawn('powershell', ['-ExecutionPolicy', 'Bypass', '-NonInteractive', '-File', script], { cwd: INSTALL_DIR, shell: false })
-          : spawn('bash', [script], { cwd: INSTALL_DIR, shell: false });
+          ? spawn('powershell', ['-ExecutionPolicy', 'Bypass', '-NonInteractive', '-File', script], { cwd: INSTALL_DIR, shell: false, env })
+          : spawn('bash', [script], { cwd: INSTALL_DIR, shell: false, env });
 
         function pushLine(raw) {
           const text = stripAnsi(raw);