oh-my-devpod 0.15.4 → 0.15.6

package/package.json

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

package/runtime/VERSION

@@ -1 +1 @@
-0.15.4
+0.15.6

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

@@ -501,32 +501,55 @@ write_inventory_record() {
   mv -f "${temporary}" "${destination}"
 }
 
-legacy_formula_is_managed() {
-  local owner_home="$1" formula="$2" marker
-  marker="${owner_home}/.local/state/oh-my-devpod/managed/${formula}"
-  [[ -f "${marker}" && ! -L "${marker}" ]] || return 1
-  grep -qx 'managed_by=oh-my-devpod' "${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
-}
-
 stage_legacy_inventory() {
-  local owner_home="$1" installation_id="$2" staging="$3" formula state provenance
+  local installation_id="$1" staging="$2" formula
   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
-      state=managed
-      provenance=legacy-marker
-    fi
-    write_inventory_record "${formula}" "${installation_id}" "${state}" "${provenance}" "${staging}/${formula}"
+    write_inventory_record "${formula}" "${installation_id}" managed legacy-managed-prefix "${staging}/${formula}"
   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" service_uid="$4" service_gid="$5" mode
+  [[ -f "${record}" && ! -L "${record}" ]] || return 1
+  if [[ "${test_mode}" != "1" ]]; then
+    [[ "$(stat_uid "${record}")" == "${service_uid}" && "$(stat_gid "${record}")" == "${service_gid}" ]] || 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 "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}"
+}
+
+recover_legacy_inventory() {
+  local installation_id service_uid service_gid record formula 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}" "${service_uid}" "${service_gid}" || continue
+    recovered="${inventory_dir}/.${formula}.recovered.$$"
+    write_inventory_record "${formula}" "${installation_id}" managed legacy-managed-prefix-recovered "${recovered}"
+    chmod 0644 "${recovered}"
+    if [[ "${test_mode}" != "1" ]]; then
+      chown "${service_uid}:${service_gid}" "${recovered}"
+    fi
+    mv -f "${recovered}" "${record}"
+  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"
@@ -593,7 +616,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 "${installation_id}" "${inventory_staging}"
   else
     created_prefix=1
     if ! initialize_prefix "${mirror_profile}"; then
@@ -844,6 +867,7 @@ ensure_shared_brew() {
     fi
     rm -f "${state_dir}/.legacy-owner"
   fi
+  recover_legacy_inventory
 }
 
 case "${1:-}" in