oh-my-devpod 0.15.3 → 0.15.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-devpod",
-  "version": "0.15.3",
+  "version": "0.15.5",
   "description": "Ubuntu productivity tool manager with the omd terminal interface",
   "license": "MIT",
   "author": "zhangdw156",

package/runtime/VERSION

@@ -1 +1 @@
-0.15.3
+0.15.5

package/runtime/build/install-gitee-cli.sh

@@ -8,6 +8,7 @@ bin_dir="${OHMYDEVPOD_BIN_DIR:-${HOME}/.local/bin}"
 target_arch="${TARGETARCH:-}"
 repo="oschina/gitee-cli"
 staged_path=""
+tar_version=""
 
 fail() {
   printf 'error: %s\n' "$*" >&2
@@ -110,7 +111,12 @@ actual_sha="$(sha256_file "${archive_path}")"
 
 extract_dir="${tmp_dir}/extract"
 mkdir -p "${extract_dir}"
-tar -xzf "${archive_path}" -C "${extract_dir}" gitee ||
+tar_extract_args=(-xzf "${archive_path}" -C "${extract_dir}")
+tar_version="$(tar --version 2>/dev/null || true)"
+if [[ "${tar_version%%$'\n'*}" == *"GNU tar"* ]]; then
+  tar_extract_args=(--warning=no-unknown-keyword "${tar_extract_args[@]}")
+fi
+tar "${tar_extract_args[@]}" gitee ||
   fail "failed to extract Gitee CLI binary"
 [[ -f "${extract_dir}/gitee" && ! -L "${extract_dir}/gitee" ]] ||
   fail "release archive does not contain a regular gitee binary"

package/runtime/build/omd-brew-provisioner.sh

@@ -201,6 +201,14 @@ trusted_prefix_resolved() {
   printf '%s\n' "${resolved}"
 }
 
+trusted_prefixes_equivalent() {
+  local first="$1" second="$2" first_resolved second_resolved
+  [[ "${first}" == /* && "${second}" == /* ]] || return 1
+  first_resolved="$(trusted_prefix_resolved "${first}")" || return 1
+  second_resolved="$(trusted_prefix_resolved "${second}")" || return 1
+  [[ "${first_resolved}" == "${second_resolved}" ]]
+}
+
 prepare_prefix_parent() {
   if path_has_no_symlink_components "$(dirname "${prefix}")"; then
     ensure_safe_parent "${prefix}"
@@ -377,8 +385,12 @@ install_policy() {
   profile_tmp="${profile_file}.tmp.$$"
   {
     printf '%s\n' '# Generated by oh-my-devpod. Shared Linuxbrew gateway.'
-    printf 'case ":$PATH:" in *":%s:"*) ;; *) PATH="%s:$PATH" ;; esac\n' "${libexec_dir}/bin" "${libexec_dir}/bin"
-    printf '%s\n' 'export PATH'
+    printf '%s\n' 'case " $(id -nG 2>/dev/null) " in'
+    printf '  *" %s "*)\n' "${manager_group}"
+    printf '    PATH="%s:%s/bin:%s/sbin:$PATH"\n' "${libexec_dir}/bin" "${prefix}" "${prefix}"
+    printf '%s\n' '    export PATH'
+    printf '%s\n' '    ;;'
+    printf '%s\n' 'esac'
   } > "${profile_tmp}"
   chmod 0644 "${profile_tmp}"
   if [[ "${test_mode}" != "1" ]]; then chown root:root "${profile_tmp}"; fi
@@ -498,24 +510,30 @@ write_inventory_record() {
 }
 
 legacy_formula_is_managed() {
-  local owner_home="$1" formula="$2" marker
+  local owner_home="$1" formula="$2" owner_uid="${3:-}" marker marker_prefix
   marker="${owner_home}/.local/state/oh-my-devpod/managed/${formula}"
   [[ -f "${marker}" && ! -L "${marker}" ]] || return 1
+  if [[ "${test_mode}" != "1" && -n "${owner_uid}" ]]; then
+    [[ "$(stat_uid "${marker}")" == "${owner_uid}" ]] || return 1
+  fi
   grep -qx 'managed_by=oh-my-devpod' "${marker}" || return 1
+  grep -Fqx "component=${formula}" "${marker}" || return 1
   grep -qx 'kind=brew-formula' "${marker}" || return 1
   grep -Fqx "artifact=${formula}" "${marker}" || return 1
-  grep -Fqx "brew_prefix=${prefix}" "${marker}" || return 1
+  marker_prefix="$(sed -n 's/^brew_prefix=//p' "${marker}")"
+  [[ -n "${marker_prefix}" ]] || return 1
+  trusted_prefixes_equivalent "${marker_prefix}" "${prefix}"
 }
 
 stage_legacy_inventory() {
-  local owner_home="$1" installation_id="$2" staging="$3" formula state provenance
+  local owner_home="$1" owner_uid="$2" installation_id="$3" staging="$4" formula state provenance
   mkdir -p "${staging}"
   [[ -d "${prefix}/Cellar" ]] || return 0
   while IFS= read -r formula; do
     [[ -n "${formula}" ]] || continue
     state=external
     provenance=legacy-preexisting
-    if legacy_formula_is_managed "${owner_home}" "${formula}"; then
+    if legacy_formula_is_managed "${owner_home}" "${formula}" "${owner_uid}"; then
       state=managed
       provenance=legacy-marker
     fi
@@ -523,6 +541,71 @@ stage_legacy_inventory() {
   done < <(find "${prefix}/Cellar" -mindepth 1 -maxdepth 1 -type d -exec basename {} \; | LC_ALL=C sort -u)
 }
 
+legacy_inventory_record_is_recoverable() {
+  local record="$1" formula="$2" installation_id="$3"
+  [[ -f "${record}" && ! -L "${record}" ]] || return 1
+  grep -qx 'managed_by=oh-my-devpod' "${record}" || return 1
+  grep -Fqx "component=${formula}" "${record}" || return 1
+  grep -qx 'kind=brew-formula' "${record}" || return 1
+  grep -Fqx "artifact=${formula}" "${record}" || return 1
+  grep -Fqx "brew_prefix=${prefix}" "${record}" || return 1
+  grep -Fqx "installation_id=${installation_id}" "${record}" || return 1
+  grep -qx 'state=external' "${record}" || return 1
+  grep -qx 'provenance=legacy-preexisting' "${record}"
+}
+
+member_identity_for_recovery() {
+  local record="$1" user uid home mode current_uid current_home
+  [[ -f "${record}" && ! -L "${record}" ]] || return 1
+  user="$(basename "${record}")"
+  valid_account_name "${user}" || return 1
+  if [[ "${test_mode}" != "1" ]]; then
+    [[ "$(stat_uid "${record}")" == "0" && "$(stat_gid "${record}")" == "0" ]] || return 1
+    mode="$(stat_mode "${record}")" || return 1
+    [[ "${mode}" =~ ^[0-7]{3,4}$ ]] || return 1
+    (( (8#${mode} & 8#022) == 0 )) || return 1
+  fi
+  grep -qx 'managed_by=oh-my-devpod' "${record}" || return 1
+  grep -Fqx "user=${user}" "${record}" || return 1
+  uid="$(sed -n 's/^uid=//p' "${record}")"
+  home="$(sed -n 's/^home=//p' "${record}")"
+  [[ "${uid}" =~ ^[0-9]+$ ]] || return 1
+  [[ "${home}" == /* && -d "${home}" && ! -L "${home}" ]] || return 1
+  if [[ "${test_mode}" != "1" ]]; then
+    current_uid="$(id -u "${user}" 2>/dev/null)" || return 1
+    current_home="$(passwd_home "${user}")"
+    [[ "${uid}" == "${current_uid}" && "${home}" == "${current_home}" ]] || return 1
+  fi
+  printf '%s\t%s\n' "${uid}" "${home}"
+}
+
+recover_legacy_inventory() {
+  local installation_id service_uid service_gid record formula member identity member_uid member_home recovered
+  installation_id="$(manifest_value installation_id || true)"
+  [[ -n "${installation_id}" ]] || return 0
+  service_uid="$(account_uid "${service_user}")"
+  service_gid="$(group_gid "${manager_group}")"
+  while IFS= read -r -d '' record; do
+    formula="$(basename "${record}")"
+    valid_formula_name "${formula}" || continue
+    legacy_inventory_record_is_recoverable "${record}" "${formula}" "${installation_id}" || continue
+    while IFS= read -r -d '' member; do
+      identity="$(member_identity_for_recovery "${member}" || true)"
+      [[ -n "${identity}" ]] || continue
+      IFS=$'\t' read -r member_uid member_home <<< "${identity}"
+      legacy_formula_is_managed "${member_home}" "${formula}" "${member_uid}" || continue
+      recovered="${inventory_dir}/.${formula}.recovered.$$"
+      write_inventory_record "${formula}" "${installation_id}" managed legacy-marker-recovered "${recovered}"
+      chmod 0644 "${recovered}"
+      if [[ "${test_mode}" != "1" ]]; then
+        chown "${service_uid}:${service_gid}" "${recovered}"
+      fi
+      mv -f "${recovered}" "${record}"
+      break
+    done < <(find "${members_dir}" -mindepth 1 -maxdepth 1 -type f -print0)
+  done < <(find "${inventory_dir}" -mindepth 1 -maxdepth 1 -type f -print0)
+}
+
 write_manifest() {
   local mirror_profile="$1" installation_id="$2" service_uid="$3" service_gid="$4" destination="$5" resolved_prefix
   resolved_prefix="$(trusted_prefix_resolved "${prefix}")" || fail "shared Brew prefix path is not trusted"
@@ -589,7 +672,7 @@ initialize_shared_state() {
   if [[ -e "${prefix}" || -L "${prefix}" ]]; then
     legacy_info="$(validate_legacy_prefix)"
     IFS=$'\t' read -r legacy_owner legacy_uid legacy_gid legacy_home <<< "${legacy_info}"
-    stage_legacy_inventory "${legacy_home}" "${installation_id}" "${inventory_staging}"
+    stage_legacy_inventory "${legacy_home}" "${legacy_uid}" "${installation_id}" "${inventory_staging}"
   else
     created_prefix=1
     if ! initialize_prefix "${mirror_profile}"; then
@@ -840,6 +923,7 @@ ensure_shared_brew() {
     fi
     rm -f "${state_dir}/.legacy-owner"
   fi
+  recover_legacy_inventory
 }
 
 case "${1:-}" in

package/runtime/install/bootstrap.sh

@@ -237,6 +237,9 @@ omd_install_archive() {
     omd_warn "Shared Linuxbrew activation failed; restored the previous omd release"
     return 1
   fi
+  if ! omd_repair_managed_login_shell_if_present "${release_dir}"; then
+    omd_warn "Updated omd, but could not repair the managed login shell; run omd to retry"
+  fi
   [[ -z "${previous_dir}" ]] || rm -rf "${previous_dir}" || true
   printf '%s\n' "${version}"
 }
@@ -430,6 +433,25 @@ omd_activate_shared_linuxbrew_profile_if_present() {
   bash -c 'set -euo pipefail; source "$1"; omd_shared_linuxbrew_activate_if_present "$2" "$3"' _ "${helper}" "${release_root}" "${profile}"
 }
 
+omd_repair_managed_login_shell_if_present() {
+  local release_root="$1" postflight managed_dir marker managed=0
+  managed_dir="${OHMYDEVPOD_MANAGED_DIR:-${OHMYDEVPOD_STATE_DIR:-${XDG_STATE_HOME:-${HOME}/.local/state}/oh-my-devpod}/managed}"
+  for marker in "${managed_dir}/zsh" "${managed_dir}/zsh-config"; do
+    if [[ -f "${marker}" && ! -L "${marker}" ]] &&
+      grep -Fqx 'managed_by=oh-my-devpod' "${marker}"; then
+      managed=1
+      break
+    fi
+  done
+  [[ "${managed}" == "1" ]] || return 0
+  postflight="${release_root}/modules/lib/postflight.sh"
+  [[ -f "${postflight}" && ! -L "${postflight}" ]] || {
+    omd_warn "Installed release cannot repair an existing managed login shell"
+    return 1
+  }
+  bash "${postflight}" repair-login-shell >&2
+}
+
 omd_activate_shared_linuxbrew_if_present() {
   local release_root="$1" source="$2" profile
   profile="$(omd_source_mirror_profile "${source}")" || return 1

package/runtime/modules/lib/common.sh

@@ -448,6 +448,16 @@ omd_module_zsh_path() {
   command -v zsh
 }
 
+omd_module_target_user() {
+  if [[ -n "${OHMYDEVPOD_TARGET_USER:-}" ]]; then
+    printf '%s\n' "${OHMYDEVPOD_TARGET_USER}"
+  elif [[ "$(id -u)" -eq 0 && -n "${SUDO_USER:-}" ]]; then
+    printf '%s\n' "${SUDO_USER}"
+  else
+    id -un
+  fi
+}
+
 omd_module_set_login_shell() {
   local zsh_path="$1" target_user current_shell shells_file sudo_bin
   [[ -x "${zsh_path}" ]] || {
@@ -455,7 +465,7 @@ omd_module_set_login_shell() {
     return 1
   }
 
-  target_user="${OHMYDEVPOD_TARGET_USER:-${SUDO_USER:-$(id -un)}}"
+  target_user="$(omd_module_target_user)"
   shells_file="${OHMYDEVPOD_SHELLS_FILE:-/etc/shells}"
   sudo_bin="${OHMYDEVPOD_SUDO_BIN:-sudo}"
   if [[ -n "${OHMYDEVPOD_CURRENT_SHELL:-}" ]]; then

package/runtime/modules/lib/postflight.sh

@@ -5,23 +5,26 @@ source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/common.sh"
 # shellcheck source=source-config.sh
 source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/source-config.sh"
 
-case "${1:-}" in
-  install|update) ;;
+action="${1:-}"
+case "${action}" in
+  install|update|repair-login-shell) ;;
   *) omd_module_unknown_action "${1:-}" ;;
 esac
 
-case "${OHMYDEVPOD_MIRROR_PROFILE:-upstream}" in
-  cn) source_name="gitee" ;;
-  upstream) source_name="github" ;;
-  *)
-    omd_module_info notice "unknown mirror profile; native source configuration was not changed"
-    source_name=""
-    ;;
-esac
-if [[ -n "${source_name}" ]] &&
-  ! omd_source_config_apply_transactional "${source_name}"; then
-  omd_module_info error "failed to apply native source configuration"
-  exit 1
+if [[ "${action}" != "repair-login-shell" ]]; then
+  case "${OHMYDEVPOD_MIRROR_PROFILE:-upstream}" in
+    cn) source_name="gitee" ;;
+    upstream) source_name="github" ;;
+    *)
+      omd_module_info notice "unknown mirror profile; native source configuration was not changed"
+      source_name=""
+      ;;
+  esac
+  if [[ -n "${source_name}" ]] &&
+    ! omd_source_config_apply_transactional "${source_name}"; then
+    omd_module_info error "failed to apply native source configuration"
+    exit 1
+  fi
 fi
 
 if ! omd_module_is_managed zsh && ! omd_module_is_managed zsh-config; then