oh-my-devpod 0.15.3 → 0.15.4

package/package.json

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

package/runtime/VERSION

@@ -1 +1 @@
-0.15.3
+0.15.4

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

@@ -377,8 +377,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

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