Resolve Windows tooling in shell release scripts

Author: FolderView Plus Test

scripts/dev_finalize.sh

@@ -71,9 +71,10 @@ done
 cd "${ROOT_DIR}"
 
 fvplus::require_commands bash node git
+NODE_BIN="$(fvplus::resolve_platform_command node)"
 
 if [[ "${OPEN_FIXTURE}" == true ]]; then
-    node scripts/generate_runtime_fixture.mjs
+    "${NODE_BIN}" scripts/generate_runtime_fixture.mjs
 fi
 
 bash scripts/doctor.sh

scripts/doctor.sh

@@ -27,8 +27,9 @@ fvplus::require_commands "${REQUIRED_COMMANDS[@]}"
 
 echo "Tooling doctor passed."
 for cmd in "${REQUIRED_COMMANDS[@]}"; do
-  if "${cmd}" --version >/dev/null 2>&1; then
-    version_line="$("${cmd}" --version 2>/dev/null | head -n 1)"
+  resolved_cmd="$(fvplus::resolve_platform_command "${cmd}" || true)"
+  if [[ -n "${resolved_cmd}" ]] && "${resolved_cmd}" --version >/dev/null 2>&1; then
+    version_line="$("${resolved_cmd}" --version 2>/dev/null | head -n 1)"
     echo "  ${cmd}: ${version_line}"
   else
     echo "  ${cmd}: installed"

scripts/install_smoke.sh

@@ -19,6 +19,8 @@ if [[ ! -f "${ARCHIVE_FILE}" ]]; then
 fi
 
 fvplus::require_commands php node tar sed grep find
+PHP_BIN="$(fvplus::resolve_platform_command php)"
+NODE_BIN="$(fvplus::resolve_platform_command node)"
 
 ARCHIVE_LIST="$(tar -tf "${ARCHIVE_FILE}")"
 ARCHIVE_LIST_NORMALIZED="$(printf '%s\n' "${ARCHIVE_LIST}" | sed 's#^\./##')"
@@ -154,11 +156,11 @@ for required_file in "${REQUIRED_FILES[@]}"; do
 done
 
 while IFS= read -r -d '' file; do
-  php -l "${file}" >/dev/null
+  "${PHP_BIN}" -l "${file}" >/dev/null
 done < <(find "${PLUGIN_DIR}/server" -type f -name "*.php" -print0)
 
 while IFS= read -r -d '' file; do
-  node --check "${file}" >/dev/null
+  "${NODE_BIN}" --check "${file}" >/dev/null
 done < <(find "${PLUGIN_DIR}/scripts" -type f -name "*.js" ! -path "*/scripts/include/*" -print0)
 
 MUTATING_ENDPOINTS=(

scripts/lib.sh

@@ -5,11 +5,26 @@ fvplus::fail() {
   exit 1
 }
 
+fvplus::resolve_platform_command() {
+  local requested="${1:-}"
+  local resolved=""
+  [[ -n "${requested}" ]] || return 1
+  if resolved="$(command -v "${requested}" 2>/dev/null)"; then
+    printf '%s\n' "${resolved}"
+    return 0
+  fi
+  if [[ "${requested}" != *.exe ]] && resolved="$(command -v "${requested}.exe" 2>/dev/null)"; then
+    printf '%s\n' "${resolved}"
+    return 0
+  fi
+  return 1
+}
+
 fvplus::require_commands() {
   local missing=()
   local cmd
   for cmd in "$@"; do
-    if ! command -v "$cmd" >/dev/null 2>&1; then
+    if ! fvplus::resolve_platform_command "$cmd" >/dev/null 2>&1; then
       missing+=("$cmd")
     fi
   done
@@ -46,4 +61,3 @@ fvplus::archive_file() {
   archive_dir="$(fvplus::archive_dir "${root_dir}")"
   echo "${archive_dir}/folderview.plus-${version}.txz"
 }
-

scripts/release_guard.sh

@@ -11,6 +11,10 @@ ARCHIVE_DIR="${FVPLUS_ARCHIVE_DIR:-${ROOT_DIR}/archive}"
 MAX_ARCHIVE_BYTES="${FVPLUS_MAX_ARCHIVE_BYTES:-52428800}" # 50 MiB default ceiling
 MAX_ARCHIVE_FILE_COUNT="${FVPLUS_MAX_ARCHIVE_FILE_COUNT:-10000}"
 
+resolve_php_bin() {
+  fvplus::resolve_platform_command php
+}
+
 packaging_sync_hint() {
   echo "HINT: Run 'bash pkg_build.sh' and commit updated release artifacts (folderview.plus.plg + folderview.plus.xml + archive/*.txz + archive/*.sha256)." >&2
 }
@@ -145,8 +149,9 @@ fi
 if command -v xmllint >/dev/null 2>&1; then
   xmllint --noout "${PLG_FILE}"
 else
+  PHP_BIN="$(resolve_php_bin)"
   # shellcheck disable=SC2016
-  php -r '
+  "${PHP_BIN}" -r '
       libxml_use_internal_errors(true);
       $xml = @file_get_contents($argv[1]);
       if ($xml === false) { fwrite(STDERR, "ERROR: Failed to read PLG file\n"); exit(1); }

scripts/run_ci_suite.sh

@@ -58,6 +58,10 @@ done
 
 fvplus::require_commands bash node php git find shellcheck npm npx
 export FVPLUS_RELEASE_MODE="${RELEASE_MODE}"
+NODE_BIN="$(fvplus::resolve_platform_command node)"
+PHP_BIN="$(fvplus::resolve_platform_command php)"
+NPM_BIN="$(fvplus::resolve_platform_command npm)"
+NPX_BIN="$(fvplus::resolve_platform_command npx)"
 
 chmod +x \
   scripts/api_contract_guard.sh \
@@ -111,7 +115,7 @@ prepare_playwright() {
     return
   fi
   fvplus::require_commands npm npx
-  npm install --no-save playwright
+  "${NPM_BIN}" install --no-save playwright
 
   local browsers_dir="${PLAYWRIGHT_BROWSERS_PATH:-${HOME}/.cache/ms-playwright}"
   local browsers_cached=0
@@ -122,9 +126,9 @@ prepare_playwright() {
   if [[ "${browsers_cached}" -eq 1 ]] && parse_truthy "${FVPLUS_PLAYWRIGHT_SKIP_BROWSER_INSTALL_IF_CACHED:-1}"; then
     printf '[ci-suite] Playwright browsers already cached in %s, skipping browser install.\n' "${browsers_dir}"
   elif parse_truthy "${FVPLUS_PLAYWRIGHT_INSTALL_WITH_DEPS:-1}"; then
-    npx playwright install --with-deps chromium firefox webkit
+    "${NPX_BIN}" playwright install --with-deps chromium firefox webkit
   else
-    npx playwright install chromium firefox webkit
+    "${NPX_BIN}" playwright install chromium firefox webkit
   fi
   PLAYWRIGHT_READY=1
 }
@@ -141,15 +145,15 @@ lint_javascript_syntax() {
   mapfile -d '' files < <(find src -type f -name "*.js" ! -path "*/scripts/include/*" -print0)
   local file=""
   for file in "${files[@]}"; do
-    node --check "${file}"
+    "${NODE_BIN}" --check "${file}"
   done
 }
 
 lint_php_syntax() {
   mapfile -d '' files < <(find src -type f -name "*.php" -print0)
   local file=""
   for file in "${files[@]}"; do
-    php -l "${file}"
+    "${PHP_BIN}" -l "${file}"
   done
 }
 
@@ -184,15 +188,15 @@ run_lane() {
       run_timed_step shellcheck lint_shell_scripts
       run_timed_step javascript-syntax lint_javascript_syntax
       run_timed_step php-syntax lint_php_syntax
-      run_timed_step javascript-unused-symbols node scripts/js_unused_symbols_guard.mjs
-      run_timed_step php-static-analysis php scripts/php_unused_helpers_guard.php
+      run_timed_step javascript-unused-symbols "${NODE_BIN}" scripts/js_unused_symbols_guard.mjs
+      run_timed_step php-static-analysis "${PHP_BIN}" scripts/php_unused_helpers_guard.php
       ;;
     tests)
-      run_timed_step node-mobile-tests node --test tests/mobile-touch-support.test.mjs tests/mobile-regression-guard.test.mjs
-      run_timed_step node-test-suite node --test tests/*.mjs
+      run_timed_step node-mobile-tests "${NODE_BIN}" --test tests/mobile-touch-support.test.mjs tests/mobile-regression-guard.test.mjs
+      run_timed_step node-test-suite "${NODE_BIN}" --test tests/*.mjs
       ;;
     workflow-tests)
-      run_timed_step versioning-guard-tests node --test tests/versioning-guard.test.mjs tests/support-policy-contract.test.mjs
+      run_timed_step versioning-guard-tests "${NODE_BIN}" --test tests/versioning-guard.test.mjs tests/support-policy-contract.test.mjs
       ;;
     workflow-guards)
       run_timed_step docs-metadata bash scripts/docs_metadata_guard.sh

tests/versioning-guard.test.mjs

@@ -361,13 +361,17 @@ test('shared ci suite centralizes linting, tests, guards, docs metadata, and smo
     assert.match(runCiSuite, /workflow-guards/);
     assert.match(runCiSuite, /docs-guards/);
     assert.match(runCiSuite, /shellcheck -x --source-path=SCRIPTDIR/);
-    assert.match(runCiSuite, /node --check/);
-    assert.match(runCiSuite, /php -l/);
-    assert.match(runCiSuite, /node scripts\/js_unused_symbols_guard\.mjs/);
-    assert.match(runCiSuite, /php scripts\/php_unused_helpers_guard\.php/);
-    assert.match(runCiSuite, /node --test tests\/mobile-touch-support\.test\.mjs tests\/mobile-regression-guard\.test\.mjs/);
-    assert.match(runCiSuite, /node --test tests\/\*\.mjs/);
-    assert.match(runCiSuite, /node --test tests\/versioning-guard\.test\.mjs tests\/support-policy-contract\.test\.mjs/);
+    assert.match(runCiSuite, /NODE_BIN="\$\(fvplus::resolve_platform_command node\)"/);
+    assert.match(runCiSuite, /PHP_BIN="\$\(fvplus::resolve_platform_command php\)"/);
+    assert.match(runCiSuite, /NPM_BIN="\$\(fvplus::resolve_platform_command npm\)"/);
+    assert.match(runCiSuite, /NPX_BIN="\$\(fvplus::resolve_platform_command npx\)"/);
+    assert.match(runCiSuite, /"\$\{NODE_BIN\}" --check/);
+    assert.match(runCiSuite, /"\$\{PHP_BIN\}" -l/);
+    assert.match(runCiSuite, /"\$\{NODE_BIN\}" scripts\/js_unused_symbols_guard\.mjs/);
+    assert.match(runCiSuite, /"\$\{PHP_BIN\}" scripts\/php_unused_helpers_guard\.php/);
+    assert.match(runCiSuite, /"\$\{NODE_BIN\}" --test tests\/mobile-touch-support\.test\.mjs tests\/mobile-regression-guard\.test\.mjs/);
+    assert.match(runCiSuite, /"\$\{NODE_BIN\}" --test tests\/\*\.mjs/);
+    assert.match(runCiSuite, /"\$\{NODE_BIN\}" --test tests\/versioning-guard\.test\.mjs tests\/support-policy-contract\.test\.mjs/);
     assert.match(runCiSuite, /bash scripts\/release_guard\.sh/);
     assert.match(runCiSuite, /bash scripts\/install_smoke\.sh/);
     assert.match(runCiSuite, /bash scripts\/main_branch_history_guard\.sh/);
@@ -376,10 +380,10 @@ test('shared ci suite centralizes linting, tests, guards, docs metadata, and smo
     assert.match(runCiSuite, /bash scripts\/workflow_self_check\.sh/);
     assert.match(runCiSuite, /bash scripts\/browser_smoke\.sh/);
     assert.match(runCiSuite, /bash scripts\/theme_matrix_smoke\.sh/);
-    assert.match(runCiSuite, /npm install --no-save playwright/);
+    assert.match(runCiSuite, /"\$\{NPM_BIN\}" install --no-save playwright/);
     assert.match(runCiSuite, /FVPLUS_PLAYWRIGHT_SKIP_BROWSER_INSTALL_IF_CACHED/);
     assert.match(runCiSuite, /Playwright browsers already cached/);
-    assert.match(runCiSuite, /npx playwright install --with-deps chromium firefox webkit/);
+    assert.match(runCiSuite, /"\$\{NPX_BIN\}" playwright install --with-deps chromium firefox webkit/);
     assert.match(runCiSuite, /FVPLUS_BROWSER_SMOKE_REQUIRED/);
     assert.match(runCiSuite, /FVPLUS_THEME_MATRIX_REQUIRED/);
     assert.match(runCiSuite, /FVPLUS_CI_TIMINGS_PATH/);