oh-my-devpod 0.15.0 → 0.15.1

package/package.json

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

package/runtime/VERSION

@@ -1 +1 @@
-0.15.0
+0.15.1

package/runtime/install/bootstrap.sh

@@ -421,16 +421,8 @@ omd_source_brew_core_remote() {
 }
 
 omd_activate_shared_linuxbrew_profile_if_present() {
-  local release_root="$1" profile="$2" helper prefix state_dir
+  local release_root="$1" profile="$2" helper
   helper="${release_root}/modules/lib/shared-linuxbrew.sh"
-  if [[ "${OHMYDEVPOD_SHARED_BREW_TEST_MODE:-0}" == "1" ]]; then
-    prefix="${OHMYDEVPOD_SHARED_BREW_PREFIX:-/home/linuxbrew/.linuxbrew}"
-    state_dir="${OHMYDEVPOD_SHARED_BREW_STATE_DIR:-/var/lib/oh-my-devpod/linuxbrew}"
-  else
-    prefix="/home/linuxbrew/.linuxbrew"
-    state_dir="/var/lib/oh-my-devpod/linuxbrew"
-  fi
-  [[ -e "${prefix}" || -L "${prefix}" || -e "${state_dir}/manifest" || -L "${state_dir}/manifest" ]] || return 0
   [[ -f "${helper}" && ! -L "${helper}" ]] || {
     omd_warn "Installed release cannot activate the existing shared Linuxbrew installation"
     return 1

package/runtime/modules/lib/shared-linuxbrew.sh

@@ -43,6 +43,38 @@ omd_shared_linuxbrew_state_claim_present() {
   [[ -e "${manifest}" || -L "${manifest}" ]]
 }
 
+omd_shared_linuxbrew_legacy_marker() {
+  local prefix owner_uid owner_home=""
+  prefix="$(omd_shared_linuxbrew_prefix)"
+  if omd_shared_linuxbrew_test_mode; then
+    owner_home="${OHMYDEVPOD_SHARED_BREW_TEST_LEGACY_HOME:-${HOME}}"
+  else
+    owner_uid="$(omd_shared_linuxbrew_stat_uid "${prefix}")" || return 1
+    if command -v getent >/dev/null 2>&1; then
+      owner_home="$(getent passwd "${owner_uid}" 2>/dev/null | awk -F: '{print $6}')"
+    elif [[ "$(id -u)" == "${owner_uid}" ]]; then
+      owner_home="${HOME}"
+    fi
+  fi
+  [[ "${owner_home}" == /* && -d "${owner_home}" && ! -L "${owner_home}" ]] || return 1
+  printf '%s/.local/state/oh-my-devpod/managed/linuxbrew\n' "${owner_home}"
+}
+
+omd_shared_linuxbrew_activation_candidate() {
+  local prefix marker
+  if omd_shared_linuxbrew_state_claim_present; then
+    return 0
+  fi
+  prefix="$(omd_shared_linuxbrew_prefix)"
+  [[ -e "${prefix}" || -L "${prefix}" ]] || return 1
+  marker="$(omd_shared_linuxbrew_legacy_marker)"
+  [[ -f "${marker}" && ! -L "${marker}" ]] || return 1
+  grep -Fqx 'managed_by=oh-my-devpod' "${marker}" || return 1
+  grep -Fqx 'component=linuxbrew' "${marker}" || return 1
+  grep -Fqx 'kind=directory' "${marker}" || return 1
+  grep -Fqx "artifact=${prefix}" "${marker}"
+}
+
 omd_shared_linuxbrew_enabled() {
   [[ "${OHMYDEVPOD_SHARED_BREW_DISABLE:-0}" != "1" ]]
 }
@@ -233,10 +265,8 @@ omd_shared_linuxbrew_set_profile() {
 }
 
 omd_shared_linuxbrew_activate_if_present() {
-  local bundle_root="$1" mirror_profile="${2:-upstream}" prefix manifest
+  local bundle_root="$1" mirror_profile="${2:-upstream}"
   omd_shared_linuxbrew_enabled || return 0
-  prefix="$(omd_shared_linuxbrew_prefix)"
-  manifest="$(omd_shared_linuxbrew_manifest)"
-  [[ -e "${prefix}" || -L "${prefix}" || -e "${manifest}" || -L "${manifest}" ]] || return 0
+  omd_shared_linuxbrew_activation_candidate || return 0
   omd_shared_linuxbrew_provision "${bundle_root}" "${mirror_profile}"
 }