oh-my-devpod 0.14.2 → 0.14.4

package/runtime/install/update.sh

@@ -7,6 +7,8 @@ export OHMYDEVPOD_BOOTSTRAP_LIB_ONLY=1
 source "${bundle_root}/install/bootstrap.sh"
 # shellcheck source=../modules/lib/common.sh
 source "${bundle_root}/modules/lib/common.sh"
+# shellcheck source=../modules/lib/source-config.sh
+source "${bundle_root}/modules/lib/source-config.sh"
 
 omd_update_normalize_version() {
   printf '%s\n' "${1#v}"
@@ -30,10 +32,44 @@ omd_update_archive_version() {
   printf '%s\n' "${version}"
 }
 
+omd_update_install_archive() {
+  local archive="$1" prefix="$2" bin_dir="$3" cache_dir="$4"
+  local staging_dir candidate_root candidate_bootstrap installed_version
+  staging_dir="$(mktemp -d "${cache_dir}/.candidate-bootstrap.XXXXXX")" || return 1
+  if ! tar -xzf "${archive}" -C "${staging_dir}"; then
+    rm -rf "${staging_dir}"
+    return 1
+  fi
+  candidate_root="${staging_dir}/oh-my-devpod"
+  if ! omd_validate_bundle "${candidate_root}"; then
+    rm -rf "${staging_dir}"
+    return 1
+  fi
+  candidate_bootstrap="${candidate_root}/install/bootstrap.sh"
+  if ! installed_version="$(
+    OHMYDEVPOD_BOOTSTRAP_LIB_ONLY=1 \
+      bash -c '
+        set -euo pipefail
+        source "$1"
+        omd_install_archive "$2" "$3" "$4"
+      ' _ \
+      "${candidate_bootstrap}" \
+      "${archive}" \
+      "${prefix}" \
+      "${bin_dir}"
+  )"; then
+    rm -rf "${staging_dir}"
+    return 1
+  fi
+  rm -rf "${staging_dir}"
+  [[ -n "${installed_version}" ]] || return 1
+  printf '%s\n' "${installed_version}"
+}
+
 omd_update_snapshot_source_config() {
   local config_dir="$1" snapshot_dir="$2" name
   mkdir -p "${snapshot_dir}" || return 1
-  for name in source mirror-profile env uv.toml install-prefix bin-dir cache-dir; do
+  for name in source npm-source mirror-profile env uv.toml install-prefix bin-dir cache-dir; do
     if [[ -f "${config_dir}/${name}" ]]; then
       cp -p "${config_dir}/${name}" "${snapshot_dir}/${name}" || return 1
     else
@@ -45,7 +81,7 @@ omd_update_snapshot_source_config() {
 omd_update_restore_source_config() {
   local config_dir="$1" snapshot_dir="$2" name
   mkdir -p "${config_dir}" || return 1
-  for name in source mirror-profile env uv.toml install-prefix bin-dir cache-dir; do
+  for name in source npm-source mirror-profile env uv.toml install-prefix bin-dir cache-dir; do
     if [[ -f "${snapshot_dir}/.missing-${name}" ]]; then
       rm -f "${config_dir}/${name}" || return 1
     else
@@ -61,12 +97,24 @@ OMD_UPDATE_BREW_REMOTE=""
 OMD_UPDATE_BREW_REMOTE_PRESENT=0
 OMD_UPDATE_BREW_REMOTE_CHANGED=0
 OMD_UPDATE_BREW_LEGACY=0
+OMD_UPDATE_BREW_CORE_PREFIX=""
+OMD_UPDATE_BREW_CORE_REMOTE=""
+OMD_UPDATE_BREW_CORE_REMOTE_PRESENT=0
+OMD_UPDATE_BREW_CORE_REMOTE_CHANGED=0
 
 omd_update_capture_brew_remote() {
-  local marker_prefix
+  local marker_prefix core_prefix
   omd_module_is_managed linuxbrew || return 0
   marker_prefix="$(omd_module_marker_value linuxbrew artifact || true)"
-  [[ -n "${marker_prefix}" && -d "${marker_prefix}" ]] || return 0
+  [[ -n "${marker_prefix}" && -d "${marker_prefix}" && -x "${marker_prefix}/bin/brew" ]] || {
+    omd_warn "Managed Homebrew prefix is missing or invalid: ${marker_prefix:-<empty>}"
+    return 1
+  }
+  marker_prefix="$(cd "${marker_prefix}" 2>/dev/null && pwd -P)" || return 1
+  omd_module_brew_cmd_matches_prefix "${marker_prefix}/bin/brew" "${marker_prefix}" || {
+    omd_warn "Managed Homebrew command does not belong to its recorded prefix"
+    return 1
+  }
   command -v git >/dev/null 2>&1 || {
     omd_warn "Git is required to switch the managed Homebrew remote"
     return 1
@@ -75,50 +123,91 @@ omd_update_capture_brew_remote() {
   OMD_UPDATE_BREW_PREFIX="${marker_prefix}"
   if [[ ! -d "${marker_prefix}/.git" ]]; then
     OMD_UPDATE_BREW_LEGACY=1
-    return 0
-  fi
-  if OMD_UPDATE_BREW_REMOTE="$(git -C "${marker_prefix}" remote get-url origin 2>/dev/null)"; then
-    OMD_UPDATE_BREW_REMOTE_PRESENT=1
   else
-    OMD_UPDATE_BREW_REMOTE=""
-    OMD_UPDATE_BREW_REMOTE_PRESENT=0
+    if OMD_UPDATE_BREW_REMOTE="$(git -C "${marker_prefix}" remote get-url origin 2>/dev/null)"; then
+      OMD_UPDATE_BREW_REMOTE_PRESENT=1
+    else
+      OMD_UPDATE_BREW_REMOTE=""
+      OMD_UPDATE_BREW_REMOTE_PRESENT=0
+    fi
+  fi
+
+  core_prefix="${marker_prefix}/Library/Taps/homebrew/homebrew-core"
+  if [[ -d "${core_prefix}/.git" ]]; then
+    OMD_UPDATE_BREW_CORE_PREFIX="${core_prefix}"
+    if OMD_UPDATE_BREW_CORE_REMOTE="$(git -C "${core_prefix}" remote get-url origin 2>/dev/null)"; then
+      OMD_UPDATE_BREW_CORE_REMOTE_PRESENT=1
+    else
+      OMD_UPDATE_BREW_CORE_REMOTE=""
+      OMD_UPDATE_BREW_CORE_REMOTE_PRESENT=0
+    fi
   fi
 }
 
 omd_update_apply_brew_remote() {
-  local source="$1" target_remote
+  local source="$1" target_remote target_core_remote
   [[ -n "${OMD_UPDATE_BREW_PREFIX}" ]] || return 0
   target_remote="$(omd_source_brew_remote "${source}")" || return 1
   if [[ "${OMD_UPDATE_BREW_LEGACY}" == "1" ]]; then
     git -C "${OMD_UPDATE_BREW_PREFIX}" init -q || return 1
     OMD_UPDATE_BREW_REMOTE_CHANGED=1
     git -C "${OMD_UPDATE_BREW_PREFIX}" remote add origin "${target_remote}" || return 1
-    return 0
+  else
+    if [[ "${OMD_UPDATE_BREW_REMOTE_PRESENT}" == "1" ]]; then
+      if [[ "${OMD_UPDATE_BREW_REMOTE}" != "${target_remote}" ]]; then
+        git -C "${OMD_UPDATE_BREW_PREFIX}" remote set-url origin "${target_remote}" ||
+          return 1
+        OMD_UPDATE_BREW_REMOTE_CHANGED=1
+      fi
+    else
+      git -C "${OMD_UPDATE_BREW_PREFIX}" remote add origin "${target_remote}" || return 1
+      OMD_UPDATE_BREW_REMOTE_CHANGED=1
+    fi
   fi
-  if [[ "${OMD_UPDATE_BREW_REMOTE_PRESENT}" == "1" ]]; then
-    [[ "${OMD_UPDATE_BREW_REMOTE}" == "${target_remote}" ]] && return 0
-    git -C "${OMD_UPDATE_BREW_PREFIX}" remote set-url origin "${target_remote}" || return 1
+
+  [[ -n "${OMD_UPDATE_BREW_CORE_PREFIX}" ]] || return 0
+  target_core_remote="$(omd_source_brew_core_remote "${source}")" || return 1
+  if [[ "${OMD_UPDATE_BREW_CORE_REMOTE_PRESENT}" == "1" ]]; then
+    if [[ "${OMD_UPDATE_BREW_CORE_REMOTE}" != "${target_core_remote}" ]]; then
+      git -C "${OMD_UPDATE_BREW_CORE_PREFIX}" remote set-url origin "${target_core_remote}" ||
+        return 1
+      OMD_UPDATE_BREW_CORE_REMOTE_CHANGED=1
+    fi
   else
-    git -C "${OMD_UPDATE_BREW_PREFIX}" remote add origin "${target_remote}" || return 1
+    git -C "${OMD_UPDATE_BREW_CORE_PREFIX}" remote add origin "${target_core_remote}" ||
+      return 1
+    OMD_UPDATE_BREW_CORE_REMOTE_CHANGED=1
   fi
-  OMD_UPDATE_BREW_REMOTE_CHANGED=1
 }
 
 omd_update_restore_brew_remote() {
-  [[ "${OMD_UPDATE_BREW_REMOTE_CHANGED}" == "1" ]] || return 0
-  if [[ "${OMD_UPDATE_BREW_LEGACY}" == "1" ]]; then
-    rm -rf "${OMD_UPDATE_BREW_PREFIX}/.git"
-    return
+  local rollback_failed=0
+  if [[ "${OMD_UPDATE_BREW_CORE_REMOTE_CHANGED}" == "1" ]]; then
+    if [[ "${OMD_UPDATE_BREW_CORE_REMOTE_PRESENT}" == "1" ]]; then
+      git -C "${OMD_UPDATE_BREW_CORE_PREFIX}" remote set-url origin "${OMD_UPDATE_BREW_CORE_REMOTE}" ||
+        rollback_failed=1
+    else
+      git -C "${OMD_UPDATE_BREW_CORE_PREFIX}" remote remove origin ||
+        rollback_failed=1
+    fi
   fi
-  if [[ "${OMD_UPDATE_BREW_REMOTE_PRESENT}" == "1" ]]; then
-    git -C "${OMD_UPDATE_BREW_PREFIX}" remote set-url origin "${OMD_UPDATE_BREW_REMOTE}"
-  else
-    git -C "${OMD_UPDATE_BREW_PREFIX}" remote remove origin
+  if [[ "${OMD_UPDATE_BREW_REMOTE_CHANGED}" == "1" ]]; then
+    if [[ "${OMD_UPDATE_BREW_LEGACY}" == "1" ]]; then
+      rm -rf "${OMD_UPDATE_BREW_PREFIX}/.git" || rollback_failed=1
+    elif [[ "${OMD_UPDATE_BREW_REMOTE_PRESENT}" == "1" ]]; then
+      git -C "${OMD_UPDATE_BREW_PREFIX}" remote set-url origin "${OMD_UPDATE_BREW_REMOTE}" ||
+        rollback_failed=1
+    else
+      git -C "${OMD_UPDATE_BREW_PREFIX}" remote remove origin ||
+        rollback_failed=1
+    fi
   fi
+  return "${rollback_failed}"
 }
 
 omd_update_abort_with_rollback() {
   local message="$1" config_dir="$2" snapshot_dir="$3" rollback_failed=0
+  omd_source_config_restore "${snapshot_dir}" || rollback_failed=1
   omd_update_restore_brew_remote || rollback_failed=1
   omd_update_restore_source_config "${config_dir}" "${snapshot_dir}" || rollback_failed=1
   if [[ "${rollback_failed}" == "0" ]]; then
@@ -128,10 +217,45 @@ omd_update_abort_with_rollback() {
   omd_error "${message}; automatic rollback was incomplete; recovery snapshot: ${snapshot_dir}"
 }
 
+omd_update_current_source() {
+  local config_dir="$1" install_channel="$2" source
+  if [[ "${install_channel}" == "npm" ]]; then
+    source="${OHMYDEVPOD_NPM_SOURCE:-}"
+    if [[ -z "${source}" && -f "${config_dir}/npm-source" ]]; then
+      source="$(tr -d '[:space:]' < "${config_dir}/npm-source")"
+    fi
+    case "${source}" in
+      github|gitee)
+        printf '%s\n' "${source}"
+        return 0
+        ;;
+      *)
+        omd_warn "Invalid npm source '${source:-<empty>}'; falling back to GitHub"
+        printf 'github\n'
+        return 0
+        ;;
+    esac
+  fi
+  omd_read_saved_source "${config_dir}"
+}
+
+omd_update_persist_selected_source() {
+  local source="$1" config_dir="$2" configure_source="$3" install_channel="$4"
+  if [[ "${install_channel}" == "npm" ]]; then
+    omd_persist_source "${source}" "${config_dir}" 0 || return 1
+    printf '%s\n' "${source}" |
+      omd_atomic_write "${config_dir}/npm-source" ||
+      return 1
+    return 0
+  fi
+  omd_persist_source "${source}" "${config_dir}" "${configure_source}"
+}
+
 omd_update_main() {
   local requested_source="" current_source update_source current_version latest_tag latest_version
   local target prefix bin_dir cache_dir config_dir archive checksum archive_version installed_version
-  local snapshot_dir="" source_changed=0 configure_source=0 manage_source=0
+  local snapshot_dir="" source_changed=0 configure_source=0 manage_source=0 source_only=0
+  local install_channel="${OHMYDEVPOD_INSTALL_CHANNEL:-bootstrap}"
 
   case "$#" in
     0) ;;
@@ -148,21 +272,33 @@ omd_update_main() {
         *) omd_error "Unknown self-update option: $1" ;;
       esac
       ;;
+    2)
+      [[ "$1" == "--source-only" ]] ||
+        omd_error "Use only one of --github or --gitee"
+      source_only=1
+      configure_source=1
+      case "$2" in
+        --github) requested_source="github" ;;
+        --gitee) requested_source="gitee" ;;
+        *) omd_error "Source-only switching requires --github or --gitee" ;;
+      esac
+      ;;
     *) omd_error "Use only one of --github or --gitee" ;;
   esac
 
   omd_require_linux
-  omd_require_command curl
-  omd_require_command tar
-  omd_require_command sha256sum
+  if [[ "${source_only}" != "1" ]]; then
+    omd_require_command curl
+    omd_require_command tar
+    omd_require_command sha256sum
+  fi
 
-  target="$(omd_target_triple)"
   prefix="${OHMYDEVPOD_PREFIX:-${OMD_DEFAULT_PREFIX}}"
   bin_dir="${OHMYDEVPOD_BIN_DIR:-${OMD_DEFAULT_BIN_DIR}}"
   cache_dir="${OHMYDEVPOD_CACHE_DIR:-${OMD_DEFAULT_CACHE_DIR}}"
   config_dir="${OHMYDEVPOD_CONFIG_DIR:-${OMD_DEFAULT_CONFIG_DIR}}"
   current_version="${OHMYDEVPOD_CURRENT_VERSION:-$(tr -d '[:space:]' < "${bundle_root}/VERSION")}"
-  current_source="$(omd_read_saved_source "${config_dir}")"
+  current_source="$(omd_update_current_source "${config_dir}" "${install_channel}")"
   update_source="${requested_source:-${current_source}}"
   [[ "${current_source}" == "${update_source}" ]] || source_changed=1
   if [[ "${configure_source}" == "1" ]]; then
@@ -174,40 +310,47 @@ omd_update_main() {
 
   mkdir -p "${cache_dir}" "$(dirname "${config_dir}")"
 
-  if [[ -n "${OHMYDEVPOD_OMD_ARCHIVE:-}" ]]; then
-    archive="${OHMYDEVPOD_OMD_ARCHIVE}"
-    checksum="${OHMYDEVPOD_OMD_CHECKSUM:-${archive}.sha256}"
-    [[ -f "${checksum}" ]] ||
-      omd_error "Local archive override requires a checksum file: ${checksum}"
-    omd_verify_checksum "${archive}" "${checksum}" ||
-      omd_error "Self-update checksum verification failed; current installation and source were preserved"
-    latest_tag="$(omd_update_archive_version "${archive}" "${cache_dir}")" ||
-      omd_error "Self-update archive validation failed; current installation and source were preserved"
+  if [[ "${source_only}" == "1" ]]; then
+    archive=""
+    printf 'Current source: %s\n' "${current_source}"
+    printf 'New source: %s\n' "${update_source}"
   else
-    latest_tag="$(omd_resolve_version "${update_source}" "${OHMYDEVPOD_VERSION:-latest}")" ||
-      omd_error "Failed to query the latest ${update_source} release; current installation and source were preserved"
-  fi
-  latest_version="$(omd_update_normalize_version "${latest_tag}")"
+    target="$(omd_target_triple)"
+    if [[ -n "${OHMYDEVPOD_OMD_ARCHIVE:-}" ]]; then
+      archive="${OHMYDEVPOD_OMD_ARCHIVE}"
+      checksum="${OHMYDEVPOD_OMD_CHECKSUM:-${archive}.sha256}"
+      [[ -f "${checksum}" ]] ||
+        omd_error "Local archive override requires a checksum file: ${checksum}"
+      omd_verify_checksum "${archive}" "${checksum}" ||
+        omd_error "Self-update checksum verification failed; current installation and source were preserved"
+      latest_tag="$(omd_update_archive_version "${archive}" "${cache_dir}")" ||
+        omd_error "Self-update archive validation failed; current installation and source were preserved"
+    else
+      latest_tag="$(omd_resolve_version "${update_source}" "${OHMYDEVPOD_VERSION:-latest}")" ||
+        omd_error "Failed to query the latest ${update_source} release; current installation and source were preserved"
+    fi
+    latest_version="$(omd_update_normalize_version "${latest_tag}")"
 
-  printf 'Current version: %s\n' "${current_version}"
-  printf 'Current source: %s\n' "${current_source}"
-  printf 'Update source: %s\n' "${update_source}"
-  printf 'Latest version: %s\n' "${latest_version}"
+    printf 'Current version: %s\n' "${current_version}"
+    printf 'Current source: %s\n' "${current_source}"
+    printf 'Update source: %s\n' "${update_source}"
+    printf 'Latest version: %s\n' "${latest_version}"
 
-  if [[ "$(omd_update_normalize_version "${current_version}")" != "${latest_version}" ]]; then
-    if [[ -z "${OHMYDEVPOD_OMD_ARCHIVE:-}" ]]; then
-      OMD_DOWNLOADED_ARCHIVE=""
-      OMD_SELECTED_SOURCE=""
-      omd_download_release "${update_source}" "${latest_tag}" "${target}" "${cache_dir}" ||
-        omd_error "Self-update download or checksum verification failed; current installation and source were preserved"
-      archive="${OMD_DOWNLOADED_ARCHIVE}"
-      archive_version="$(omd_update_archive_version "${archive}" "${cache_dir}")" ||
-        omd_error "Self-update archive validation failed; current installation and source were preserved"
-      [[ "$(omd_update_normalize_version "${archive_version}")" == "${latest_version}" ]] ||
-        omd_error "Release archive version ${archive_version} does not match ${latest_tag}; current installation and source were preserved"
+    if [[ "$(omd_update_normalize_version "${current_version}")" != "${latest_version}" ]]; then
+      if [[ -z "${OHMYDEVPOD_OMD_ARCHIVE:-}" ]]; then
+        OMD_DOWNLOADED_ARCHIVE=""
+        OMD_SELECTED_SOURCE=""
+        omd_download_release "${update_source}" "${latest_tag}" "${target}" "${cache_dir}" ||
+          omd_error "Self-update download or checksum verification failed; current installation and source were preserved"
+        archive="${OMD_DOWNLOADED_ARCHIVE}"
+        archive_version="$(omd_update_archive_version "${archive}" "${cache_dir}")" ||
+          omd_error "Self-update archive validation failed; current installation and source were preserved"
+        [[ "$(omd_update_normalize_version "${archive_version}")" == "${latest_version}" ]] ||
+          omd_error "Release archive version ${archive_version} does not match ${latest_tag}; current installation and source were preserved"
+      fi
+    else
+      archive=""
     fi
-  else
-    archive=""
   fi
 
   if [[ -n "${archive}" ]]; then
@@ -228,11 +371,23 @@ omd_update_main() {
       rm -rf "${snapshot_dir}"
       omd_error "Could not snapshot source configuration"
     }
+    omd_source_config_validate "${update_source}" || {
+      rm -rf "${snapshot_dir}"
+      omd_error "Installed managed software has user-modified source configuration; current source was preserved"
+    }
+    omd_source_config_snapshot "${snapshot_dir}" || {
+      rm -rf "${snapshot_dir}"
+      omd_error "Could not snapshot installed software source configuration"
+    }
     omd_update_capture_brew_remote || {
       rm -rf "${snapshot_dir}"
       omd_error "Could not inspect the managed Homebrew remote"
     }
-    if ! omd_persist_source "${update_source}" "${config_dir}" "${configure_source}"; then
+    if ! omd_update_persist_selected_source \
+      "${update_source}" \
+      "${config_dir}" \
+      "${configure_source}" \
+      "${install_channel}"; then
       omd_update_abort_with_rollback "Could not update source configuration" "${config_dir}" "${snapshot_dir}"
     fi
     if ! omd_persist_install_paths "${prefix}" "${bin_dir}" "${cache_dir}" "${config_dir}"; then
@@ -241,10 +396,25 @@ omd_update_main() {
     if ! omd_update_apply_brew_remote "${update_source}"; then
       omd_update_abort_with_rollback "Could not switch the managed Homebrew remote" "${config_dir}" "${snapshot_dir}"
     fi
+    if ! omd_source_config_apply "${update_source}"; then
+      omd_update_abort_with_rollback "Could not switch installed software source configuration" "${config_dir}" "${snapshot_dir}"
+    fi
+  fi
+
+  if [[ "${source_only}" == "1" ]]; then
+    [[ -z "${snapshot_dir}" ]] || rm -rf "${snapshot_dir}"
+    printf 'Source configuration updated successfully.\n'
+    return 0
   fi
 
   if [[ -n "${archive}" ]]; then
-    if ! installed_version="$(omd_install_archive "${archive}" "${prefix}" "${bin_dir}")"; then
+    if ! installed_version="$(
+      omd_update_install_archive \
+        "${archive}" \
+        "${prefix}" \
+        "${bin_dir}" \
+        "${cache_dir}"
+    )"; then
       if [[ "${manage_source}" == "1" ]]; then
         omd_update_abort_with_rollback "Self-update installation failed" "${config_dir}" "${snapshot_dir}"
       fi

package/runtime/modules/core/micromamba.sh

@@ -2,6 +2,8 @@
 set -euo pipefail
 
 source "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/lib/common.sh"
+# shellcheck source=../lib/source-config.sh
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/lib/source-config.sh"
 
 component="micromamba"
 formula="micromamba"
@@ -14,7 +16,15 @@ install_or_update() {
   shift
   omd_module_formula_install_or_update "${component}" "${formula}" "${command_name}" "${action}" "$@"
 }
-uninstall() { omd_module_formula_uninstall "${component}" "${formula}" "$@"; }
+uninstall() {
+  if omd_module_dry_run "$@"; then
+    omd_module_formula_uninstall "${component}" "${formula}" "$@"
+    return
+  fi
+  omd_module_formula_uninstall_keep_marker "${component}" "${formula}" "$@" || return
+  omd_source_config_remove_component "${component}" || return
+  omd_module_unmark_managed "${component}"
+}
 
 case "${1:-}" in
   status) status ;;

package/runtime/modules/core/uv.sh

@@ -2,6 +2,8 @@
 set -euo pipefail
 
 source "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/lib/common.sh"
+# shellcheck source=../lib/source-config.sh
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/lib/source-config.sh"
 
 component="uv"
 formula="uv"
@@ -14,7 +16,15 @@ install_or_update() {
   shift
   omd_module_formula_install_or_update "${component}" "${formula}" "${command_name}" "${action}" "$@"
 }
-uninstall() { omd_module_formula_uninstall "${component}" "${formula}" "$@"; }
+uninstall() {
+  if omd_module_dry_run "$@"; then
+    omd_module_formula_uninstall "${component}" "${formula}" "$@"
+    return
+  fi
+  omd_module_formula_uninstall_keep_marker "${component}" "${formula}" "$@" || return
+  omd_source_config_remove_component "${component}" || return
+  omd_module_unmark_managed "${component}"
+}
 
 case "${1:-}" in
   status) status ;;