fix: wrapper scripts for all CLIs — env vars work immediately without source
Problem: `sudo bash install.sh` runs in child process, `export` inside it never reaches the user's current shell. /etc/environment and /etc/profile.d/ only work for NEW sessions. So `codex`/`gemini`/`qwen` fail with "Missing environment variable" right after install. Solution: wrapper scripts that auto-source env file before exec'ing binary. - codex: /usr/local/bin/codex (wrapper) -> /usr/local/bin/.codex-bin (real) - gemini: /usr/local/bin/gemini (wrapper) -> node .../dist/index.js - qwen: /usr/local/bin/qwen (wrapper) -> node .../dist/index.js Works immediately in ANY shell, no manual `source` needed. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,13 +1,19 @@
|
||||
#!/usr/bin/env bash
|
||||
# Codex CLI — Updater
|
||||
# Downloads latest binary from GitHub + re-applies config patches.
|
||||
# Uses wrapper script so env vars work immediately in any shell.
|
||||
#
|
||||
# Usage: sudo bash ucodex_update.sh
|
||||
set -euo pipefail
|
||||
|
||||
GITEA_TOKEN="${GITEA_TOKEN:-cadffcb0a6a3be728ac1ff619bb40c86588f6837}"
|
||||
REPO_RAW="https://git.sensey24.ru/aibot777/unlimitedcoding/raw/branch/master/codex"
|
||||
GITHUB_API="https://api.github.com/repos/openai/codex/releases/latest"
|
||||
|
||||
CODEX_BIN="/usr/local/bin/.codex-bin"
|
||||
CODEX_WRAPPER="/usr/local/bin/codex"
|
||||
ENV_FILE="/etc/profile.d/codex-env.sh"
|
||||
|
||||
GREEN="\033[92m"
|
||||
CYAN="\033[96m"
|
||||
YELLOW="\033[93m"
|
||||
@@ -26,11 +32,18 @@ echo " | Codex CLI — Updater |"
|
||||
echo " +--------------------------------------+"
|
||||
echo -e "${RESET}"
|
||||
|
||||
# ---- Migrate old direct binary if needed ----
|
||||
|
||||
if [ -f "$CODEX_WRAPPER" ] && file "$CODEX_WRAPPER" | grep -q "ELF"; then
|
||||
info "Migrating old binary to $CODEX_BIN..."
|
||||
mv -f "$CODEX_WRAPPER" "$CODEX_BIN"
|
||||
fi
|
||||
|
||||
# ---- Check current version ----
|
||||
|
||||
OLD_VER="not installed"
|
||||
if command -v codex &>/dev/null; then
|
||||
OLD_VER=$(codex --version 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1 || echo "unknown")
|
||||
if [ -f "$CODEX_BIN" ]; then
|
||||
OLD_VER=$("$CODEX_BIN" --version 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1 || echo "unknown")
|
||||
info "Current version: $OLD_VER"
|
||||
fi
|
||||
|
||||
@@ -48,7 +61,6 @@ info "Latest version: $LATEST_VER"
|
||||
if [ "$OLD_VER" = "$LATEST_VER" ]; then
|
||||
log "Already up to date ($LATEST_VER)"
|
||||
else
|
||||
# ---- Download binary ----
|
||||
ARCH=$(uname -m)
|
||||
case "$ARCH" in
|
||||
x86_64) BINARY_SUFFIX="x86_64-unknown-linux-musl" ;;
|
||||
@@ -63,7 +75,6 @@ else
|
||||
curl -L -# -o "$TEMP_DIR/codex.tar.gz" "$DOWNLOAD_URL"
|
||||
tar -xzf "$TEMP_DIR/codex.tar.gz" -C "$TEMP_DIR"
|
||||
|
||||
# Find binary
|
||||
BINARY_FILE=$(find "$TEMP_DIR" -maxdepth 1 -name 'codex*' -type f ! -name '*.gz' | head -1)
|
||||
if [ -z "$BINARY_FILE" ]; then
|
||||
err "Binary not found in archive"
|
||||
@@ -71,18 +82,14 @@ else
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Kill running processes
|
||||
pkill -9 -x "codex" 2>/dev/null || true
|
||||
|
||||
# Install
|
||||
CODEX_PATH=$(which codex 2>/dev/null || echo "/usr/local/bin/codex")
|
||||
chmod +x "$BINARY_FILE"
|
||||
mv -f "$BINARY_FILE" "$CODEX_PATH"
|
||||
mv -f "$BINARY_FILE" "$CODEX_BIN"
|
||||
rm -rf "$TEMP_DIR"
|
||||
hash -r 2>/dev/null || true
|
||||
|
||||
NEW_VER=$(codex --version 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1 || echo "unknown")
|
||||
log "Binary updated: $OLD_VER → $NEW_VER"
|
||||
NEW_VER=$("$CODEX_BIN" --version 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1 || echo "unknown")
|
||||
log "Binary updated: $OLD_VER -> $NEW_VER"
|
||||
fi
|
||||
|
||||
# ---- Download and apply patches ----
|
||||
@@ -92,14 +99,14 @@ cleanup() { rm -rf "$PATCH_DIR" 2>/dev/null || true; }
|
||||
trap cleanup EXIT
|
||||
|
||||
info "Downloading patcher..."
|
||||
GITEA_TOKEN="${GITEA_TOKEN:-cadffcb0a6a3be728ac1ff619bb40c86588f6837}"
|
||||
curl -fsSL -H "Authorization: token ${GITEA_TOKEN}" "$REPO_RAW/codex_patcher.py" -o "$PATCH_DIR/codex_patcher.py"
|
||||
curl -fsSL -H "Authorization: token ${GITEA_TOKEN}" "$REPO_RAW/codex_config.json" -o "$PATCH_DIR/codex_config.json"
|
||||
|
||||
info "Applying patches..."
|
||||
python3 "$PATCH_DIR/codex_patcher.py" --apply --config "$PATCH_DIR/codex_config.json"
|
||||
|
||||
# Set env vars system-wide (all users, all sessions)
|
||||
# ---- Set env vars system-wide ----
|
||||
|
||||
API_KEY=$(python3 -c "import json; print(json.load(open('$PATCH_DIR/codex_config.json'))['api_key'])")
|
||||
BASE_URL=$(python3 -c "import json; print(json.load(open('$PATCH_DIR/codex_config.json'))['base_url'])")
|
||||
|
||||
@@ -113,17 +120,23 @@ for kv in "OPENAI_API_KEY=\"$API_KEY\"" "OPENAI_BASE_URL=\"${BASE_URL}/v1\""; do
|
||||
fi
|
||||
done
|
||||
|
||||
cat > /etc/profile.d/codex-env.sh << ENVEOF
|
||||
cat > "$ENV_FILE" << ENVEOF
|
||||
export OPENAI_API_KEY="$API_KEY"
|
||||
export OPENAI_BASE_URL="${BASE_URL}/v1"
|
||||
ENVEOF
|
||||
chmod 644 /etc/profile.d/codex-env.sh
|
||||
chmod 644 "$ENV_FILE"
|
||||
|
||||
export OPENAI_API_KEY="$API_KEY"
|
||||
export OPENAI_BASE_URL="${BASE_URL}/v1"
|
||||
# ---- Create/update wrapper ----
|
||||
|
||||
info "Env vars set system-wide (/etc/environment + /etc/profile.d/codex-env.sh)"
|
||||
cat > "$CODEX_WRAPPER" << 'WRAPPER_EOF'
|
||||
#!/usr/bin/env bash
|
||||
[ -f /etc/profile.d/codex-env.sh ] && . /etc/profile.d/codex-env.sh
|
||||
exec /usr/local/bin/.codex-bin "$@"
|
||||
WRAPPER_EOF
|
||||
chmod +x "$CODEX_WRAPPER"
|
||||
|
||||
info "Env vars + wrapper updated"
|
||||
|
||||
log "Update complete!"
|
||||
echo -e "For current shell: ${CYAN}source /etc/profile.d/codex-env.sh${RESET}"
|
||||
echo -e "Codex works immediately — no need to source anything."
|
||||
echo ""
|
||||
|
||||
Reference in New Issue
Block a user