oh-my-devpod 0.14.2 → 0.14.3

package/README.md

@@ -24,6 +24,16 @@ npm update -g oh-my-devpod
 ```
 
 npm updates retain the saved source choice. Set
-`OHMYDEVPOD_SOURCE=github|gitee` during an update only when changing it.
+the source independently of npm updates with:
+
+```bash
+omd --source gitee
+omd --source github
+```
+
+This also migrates native source configuration for already installed,
+OMD-managed Linuxbrew, uv, Micromamba, and pip environments. User-owned
+configuration is preserved.
+
 `omd --update` is reserved for bootstrap-managed installations and is rejected
 in the npm package.

package/bin/omd

@@ -9,10 +9,14 @@ while [[ -L "${script_path}" ]]; do
 done
 
 package_root="$(cd "$(dirname "${script_path}")/.." && pwd)"
-source_file="${package_root}/.npm-source"
+package_source_file="${package_root}/.npm-source"
+config_dir="${OHMYDEVPOD_CONFIG_DIR:-${XDG_CONFIG_HOME:-${HOME}/.config}/oh-my-devpod}"
+persisted_source_file="${config_dir}/npm-source"
 runtime_root="${package_root}/runtime"
 runtime_binary="${runtime_root}/bin/omd"
 
+source_file="${persisted_source_file}"
+[[ -f "${source_file}" ]] || source_file="${package_source_file}"
 [[ -f "${source_file}" ]] || {
   printf 'oh-my-devpod: npm source selection is missing; reinstall the package\n' >&2
   exit 1
@@ -35,6 +39,7 @@ esac
 export OHMYDEVPOD_BUNDLE_ROOT="${runtime_root}"
 export OHMYDEVPOD_INSTALL_CHANNEL="npm"
 export OHMYDEVPOD_NPM_SOURCE="${source_name}"
+export OHMYDEVPOD_CONFIG_DIR="${config_dir}"
 export OHMYDEVPOD_BIN_DIR="${OHMYDEVPOD_BIN_DIR:-${HOME}/.local/bin}"
 
 exec "${runtime_binary}" "$@"

package/lib/source.js

@@ -15,6 +15,9 @@ function selectSource(value, persistedValue) {
 }
 
 function sourceStatePath(env = process.env, homeDirectory = os.homedir()) {
+  if (env.OHMYDEVPOD_CONFIG_DIR) {
+    return path.join(env.OHMYDEVPOD_CONFIG_DIR, "npm-source");
+  }
   const configHome = env.XDG_CONFIG_HOME || path.join(homeDirectory, ".config");
   return path.join(configHome, "oh-my-devpod", "npm-source");
 }

package/package.json

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

package/runtime/VERSION

@@ -1 +1 @@
-0.14.2
+0.14.3

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

@@ -0,0 +1,141 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+api_base="${OHMYDEVPOD_GITEE_CLI_API_BASE:-https://gitee.com/api/v5}"
+release_base="${OHMYDEVPOD_GITEE_CLI_RELEASE_BASE:-https://gitee.com/oschina/gitee-cli/releases/download}"
+requested_version="${OHMYDEVPOD_GITEE_CLI_VERSION:-latest}"
+bin_dir="${OHMYDEVPOD_BIN_DIR:-${HOME}/.local/bin}"
+target_arch="${TARGETARCH:-}"
+repo="oschina/gitee-cli"
+staged_path=""
+
+fail() {
+  printf 'error: %s\n' "$*" >&2
+  exit 1
+}
+
+download() {
+  local url="$1" destination="$2"
+  curl \
+    -fsSL \
+    --retry 3 \
+    --retry-delay 2 \
+    --retry-connrefused \
+    --connect-timeout 15 \
+    --max-time 300 \
+    "${url}" \
+    -o "${destination}"
+}
+
+sha256_file() {
+  local path="$1"
+  if command -v sha256sum >/dev/null 2>&1; then
+    sha256sum "${path}" | awk '{print $1}'
+  elif command -v shasum >/dev/null 2>&1; then
+    shasum -a 256 "${path}" | awk '{print $1}'
+  else
+    fail "sha256sum or shasum is required"
+  fi
+}
+
+json_field() {
+  local key="$1"
+  grep -o "\"${key}\"[[:space:]]*:[[:space:]]*\"[^\"]*\"" |
+    sed 's/^[^:]*:[[:space:]]*"\([^"]*\)"$/\1/' |
+    head -n 1
+}
+
+if [[ -z "${target_arch}" ]]; then
+  target_arch="$(uname -m)"
+fi
+
+case "${target_arch}" in
+  amd64|x86_64)
+    release_arch="amd64"
+    ;;
+  arm64|aarch64)
+    release_arch="arm64"
+    ;;
+  *)
+    fail "unsupported architecture for Gitee CLI: ${target_arch}"
+    ;;
+esac
+
+if [[ "${requested_version}" == "latest" ]]; then
+  release_endpoint="${api_base}/repos/${repo}/releases/latest"
+else
+  release_tag="${requested_version}"
+  [[ "${release_tag}" == v* ]] || release_tag="v${release_tag}"
+  release_endpoint="${api_base}/repos/${repo}/releases/tags/${release_tag}"
+fi
+
+tmp_dir="$(mktemp -d)"
+cleanup() {
+  rm -rf "${tmp_dir}"
+  [[ -z "${staged_path}" ]] || rm -f "${staged_path}"
+}
+trap cleanup EXIT
+
+release_json_path="${tmp_dir}/release.json"
+download "${release_endpoint}" "${release_json_path}" ||
+  fail "failed to fetch Gitee CLI release metadata"
+release_json="$(cat "${release_json_path}")"
+release_tag="$(printf '%s' "${release_json}" | json_field tag_name)"
+[[ "${release_tag}" =~ ^v[0-9][0-9A-Za-z.-]*$ ]] ||
+  fail "invalid Gitee CLI release tag: ${release_tag:-missing}"
+
+release_version="${release_tag#v}"
+archive_name="gitee_${release_version}_linux_${release_arch}.tar.gz"
+archive_url="${release_base}/${release_tag}/${archive_name}"
+checksums_url="${release_base}/${release_tag}/checksums.txt"
+
+archive_path="${tmp_dir}/${archive_name}"
+checksums_path="${tmp_dir}/checksums.txt"
+download "${archive_url}" "${archive_path}" ||
+  fail "failed to download ${archive_name}"
+download "${checksums_url}" "${checksums_path}" ||
+  fail "failed to download checksums.txt"
+
+expected_sha="$(
+  awk -v name="${archive_name}" \
+    '$2 == name || $2 == "./" name {print $1}' \
+    "${checksums_path}" |
+    head -n 1
+)"
+[[ "${expected_sha}" =~ ^[[:xdigit:]]{64}$ ]] ||
+  fail "checksums.txt has no valid SHA-256 entry for ${archive_name}"
+actual_sha="$(sha256_file "${archive_path}")"
+[[ "${actual_sha}" == "${expected_sha}" ]] ||
+  fail "checksum mismatch for ${archive_name}"
+
+extract_dir="${tmp_dir}/extract"
+mkdir -p "${extract_dir}"
+tar -xzf "${archive_path}" -C "${extract_dir}" 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"
+chmod 0755 "${extract_dir}/gitee"
+
+version_output="$("${extract_dir}/gitee" --version 2>&1)" ||
+  fail "downloaded Gitee CLI binary failed validation"
+version_matches=false
+for version_token in ${version_output}; do
+  version_token="${version_token#v}"
+  if [[ "${version_token}" == "${release_version}" ]]; then
+    version_matches=true
+    break
+  fi
+done
+[[ "${version_matches}" == "true" ]] ||
+  fail "downloaded Gitee CLI version does not match ${release_tag}"
+
+mkdir -p "${bin_dir}"
+[[ ! -d "${bin_dir}/gitee" ]] ||
+  fail "refusing to replace directory: ${bin_dir}/gitee"
+staged_path="${bin_dir}/.gitee.tmp.$$"
+install -m 0755 "${extract_dir}/gitee" "${staged_path}"
+mv -f "${staged_path}" "${bin_dir}/gitee"
+staged_path=""
+[[ -f "${bin_dir}/gitee" && -x "${bin_dir}/gitee" ]]
+
+printf 'Installed Gitee CLI %s to %s\n' "${release_tag}" "${bin_dir}/gitee"

package/runtime/components.toml

@@ -50,6 +50,26 @@ requires = []
 install_requires = ["linuxbrew"]
 uninstall = true
 
+[[component]]
+id = "gh"
+name = "GitHub CLI"
+description = "Official command-line client for GitHub"
+category = "development"
+module = "modules/tools/gh.sh"
+requires = []
+install_requires = ["linuxbrew"]
+uninstall = true
+
+[[component]]
+id = "gitee"
+name = "Gitee CLI"
+description = "Official command-line client for Gitee"
+category = "development"
+module = "modules/tools/gitee.sh"
+requires = []
+install_requires = []
+uninstall = true
+
 [[component]]
 id = "ripgrep"
 name = "ripgrep"
@@ -100,6 +120,16 @@ requires = []
 install_requires = ["linuxbrew"]
 uninstall = true
 
+[[component]]
+id = "yq"
+name = "yq"
+description = "YAML, JSON, XML, CSV, TOML, and properties processor"
+category = "terminal"
+module = "modules/tools/yq.sh"
+requires = []
+install_requires = ["linuxbrew"]
+uninstall = true
+
 [[component]]
 id = "atuin"
 name = "Atuin"

package/runtime/config/.zsh_plugins.txt

@@ -7,6 +7,7 @@ ohmyzsh/ohmyzsh path:lib
 # 2. OMZ 插件
 ohmyzsh/ohmyzsh path:plugins/git
 ohmyzsh/ohmyzsh path:plugins/extract
+ohmyzsh/ohmyzsh path:plugins/z
 
 # 3. Zsh 社区插件
 zsh-users/zsh-autosuggestions

package/runtime/config/.zshrc

@@ -9,7 +9,7 @@ export ZSH=/opt/vendor/zsh/ohmyzsh
 export ZSH_DISABLE_COMPFIX=true
 export DISABLE_AUTO_UPDATE=true
 ZSH_THEME=""
-plugins=(git extract)
+plugins=(git extract z)
 
 source "${ZSH}/oh-my-zsh.sh"
 [[ -f /opt/vendor/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh ]] && \

package/runtime/install/bootstrap.sh

@@ -307,16 +307,17 @@ omd_persist_source() {
   printf '%s\n' "${mirror_profile}" | omd_atomic_write "${config_dir}/mirror-profile" || return 1
   env_file="${config_dir}/env"
   {
-    printf '# Generated by oh-my-devpod. Use omd --update --github or --gitee to change this profile.\n'
+    printf '# Generated by oh-my-devpod. Use omd --source github or gitee to change this profile.\n'
     printf 'export OHMYDEVPOD_CONFIG_DIR=%q\n' "${config_dir}"
     printf 'export OHMYDEVPOD_MIRROR_PROFILE=%q\n' "${mirror_profile}"
     printf '%s\n' \
-      'unset HOMEBREW_BREW_GIT_REMOTE HOMEBREW_BOTTLE_DOMAIN HOMEBREW_API_DOMAIN' \
+      'unset HOMEBREW_BREW_GIT_REMOTE HOMEBREW_CORE_GIT_REMOTE HOMEBREW_BOTTLE_DOMAIN HOMEBREW_API_DOMAIN' \
       'unset UV_CONFIG_FILE PIP_INDEX_URL' \
       'unset CONDA_CHANNELS MAMBA_CHANNEL_ALIAS MAMBA_DEFAULT_CHANNELS'
     if [[ "${mirror_profile}" == "cn" ]]; then
       printf '%s\n' \
         'export HOMEBREW_BREW_GIT_REMOTE="https://mirrors.ustc.edu.cn/brew.git"' \
+        'export HOMEBREW_CORE_GIT_REMOTE="https://mirrors.ustc.edu.cn/homebrew-core.git"' \
         'export HOMEBREW_BOTTLE_DOMAIN="https://mirrors.ustc.edu.cn/homebrew-bottles"' \
         'export HOMEBREW_API_DOMAIN="https://mirrors.ustc.edu.cn/homebrew-bottles/api"' \
         'export UV_CONFIG_FILE="${OHMYDEVPOD_CONFIG_DIR}/uv.toml"' \
@@ -329,7 +330,7 @@ omd_persist_source() {
 
   if [[ "${mirror_profile}" == "cn" ]]; then
     cat <<'EOF' | omd_atomic_write "${config_dir}/uv.toml"
-# Generated by oh-my-devpod. Use omd --update --github or --gitee to change this profile.
+# Generated by oh-my-devpod. Use omd --source github or gitee to change this profile.
 [[index]]
 url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
 default = true
@@ -394,6 +395,14 @@ omd_source_brew_remote() {
   esac
 }
 
+omd_source_brew_core_remote() {
+  case "$1" in
+    github) printf '%s\n' "${OHMYDEVPOD_GITHUB_BREW_CORE_REMOTE:-https://github.com/Homebrew/homebrew-core.git}" ;;
+    gitee) printf '%s\n' "${OHMYDEVPOD_GITEE_BREW_CORE_REMOTE:-https://mirrors.ustc.edu.cn/homebrew-core.git}" ;;
+    *) return 1 ;;
+  esac
+}
+
 omd_main() {
   local os_release target requested_version source bin_dir prefix cache_dir config_dir
   local archive checksum selected_source installed_version candidate