Update start.sh

start.sh

@@ -1,110 +1,107 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-PORT="${PORT:-7860}"
-
-# 必须：code-server 登录密码
-if [[ -z "${PASSWORD:-}" && -z "${HASHED_PASSWORD:-}" ]]; then
-  echo "[ERROR] Missing PASSWORD/HASHED_PASSWORD secret."
-  exit 1
-fi
-
-# Hugging Face 持久化目录
-if [[ -d "/data" ]]; then
-  WORKDIR="/data/workspace"
-  EXT_DIR="/data/code-server/extensions"
-  USER_DATA_DIR="/data/code-server/user-data"
-  CODEX_DIR="/data/.codex"
-else
-  WORKDIR="${HOME}/workspace"
-  EXT_DIR="${HOME}/.local/share/code-server/extensions"
-  USER_DATA_DIR="${HOME}/.local/share/code-server/user-data"
-  CODEX_DIR="${HOME}/.codex"
-fi
-
-mkdir -p "$WORKDIR" "$EXT_DIR" "$USER_DATA_DIR" "${HOME}/.config/code-server" "$CODEX_DIR"
-
-# -------------------------
-# code-server 配置
-# -------------------------
-CONFIG_FILE="${HOME}/.config/code-server/config.yaml"
-{
-  echo "bind-addr: 0.0.0.0:${PORT}"
-  echo "auth: password"
-  if [[ -n "${HASHED_PASSWORD:-}" ]]; then
-    echo "hashed-password: ${HASHED_PASSWORD}"
-  else
-    echo "password: ${PASSWORD}"
-  fi
-  echo "cert: false"
-} > "$CONFIG_FILE"
-
-# -------------------------
-# Codex 配置文件 config.toml
-# -------------------------
-# 允许用环境变量覆盖；默认就是你给的参数
-: "${CODEX_MODEL_PROVIDER:=sub2api}"
-: "${CODEX_MODEL:=gpt-5.3-codex}"
-: "${CODEX_REASONING_EFFORT:=high}"
-: "${CODEX_NETWORK_ACCESS:=enabled}"
-: "${CODEX_DISABLE_RESPONSE_STORAGE:=true}"
-: "${CODEX_WSL_ACK:=true}"
-: "${CODEX_VERBOSITY:=high}"
-: "${CODEX_PROVIDER_NAME:=sub2api}"
-: "${CODEX_BASE_URL:=https://ai.qaq.al}"
-: "${CODEX_WIRE_API:=responses}"
-: "${CODEX_REQUIRES_OPENAI_AUTH:=true}"
-
-cat > "${CODEX_DIR}/config.toml" <<EOF
-model_provider = "${CODEX_MODEL_PROVIDER}"
-model = "${CODEX_MODEL}"
-model_reasoning_effort = "${CODEX_REASONING_EFFORT}"
-network_access = "${CODEX_NETWORK_ACCESS}"
-disable_response_storage = ${CODEX_DISABLE_RESPONSE_STORAGE}
-windows_wsl_setup_acknowledged = ${CODEX_WSL_ACK}
-model_verbosity = "${CODEX_VERBOSITY}"
-
-[model_providers.${CODEX_PROVIDER_NAME}]
-name = "${CODEX_PROVIDER_NAME}"
-base_url = "${CODEX_BASE_URL}"
-wire_api = "${CODEX_WIRE_API}"
-requires_openai_auth = ${CODEX_REQUIRES_OPENAI_AUTH}
-EOF
-
-# -------------------------
-# Codex auth.json
-# -------------------------
-# 推荐用 HF Secrets 注入 OPENAI_API_KEY
-# 或者直接放完整 JSON 到 CODEX_AUTH_JSON
-if [[ -n "${CODEX_AUTH_JSON:-}" ]]; then
-  printf '%s\n' "${CODEX_AUTH_JSON}" > "${CODEX_DIR}/auth.json"
-elif [[ -n "${OPENAI_API_KEY:-}" ]]; then
-  cat > "${CODEX_DIR}/auth.json" <<EOF
-{
-  "OPENAI_API_KEY": "${OPENAI_API_KEY}"
-}
-EOF
-else
-  echo "[WARN] No OPENAI_API_KEY/CODEX_AUTH_JSON found. Codex auth.json not generated."
-fi
-
-chmod 600 "${CODEX_DIR}/auth.json" 2>/dev/null || true
-chmod 600 "${CODEX_DIR}/config.toml" 2>/dev/null || true
-
-# 把 /data 的 codex 配置软链到 ~/.codex（避免路径不一致）
-if [[ "$CODEX_DIR" != "${HOME}/.codex" ]]; then
-  rm -rf "${HOME}/.codex"
-  ln -s "$CODEX_DIR" "${HOME}/.codex"
-fi
-
-echo "[INFO] Environment ready."
-echo "[INFO] Java: $(java -version 2>&1 | head -n1 || true)"
-echo "[INFO] Python: $(python3 --version || true)"
-echo "[INFO] Node: $(node --version || true)"
-echo "[INFO] g++: $(g++ --version | head -n1 || true)"
-echo "[INFO] Codex config path: ${HOME}/.codex/config.toml"
-
-exec code-server "$WORKDIR" \
-  --extensions-dir "$EXT_DIR" \
-  --user-data-dir "$USER_DATA_DIR" \
+#!/usr/bin/env bash
+set -euo pipefail
+
+PORT="${PORT:-7860}"
+
+# code-server 登录密码：必须在 HF Secrets 里配置
+if [[ -z "${PASSWORD:-}" && -z "${HASHED_PASSWORD:-}" ]]; then
+  echo "[ERROR] Missing PASSWORD/HASHED_PASSWORD secret."
+  exit 1
+fi
+
+# Hugging Face 持久化目录支持
+if [[ -d "/data" ]]; then
+  WORKDIR="/data/workspace"
+  EXT_DIR="/data/code-server/extensions"
+  USER_DATA_DIR="/data/code-server/user-data"
+  CODEX_DIR="/data/.codex"
+else
+  WORKDIR="${HOME}/workspace"
+  EXT_DIR="${HOME}/.local/share/code-server/extensions"
+  USER_DATA_DIR="${HOME}/.local/share/code-server/user-data"
+  CODEX_DIR="${HOME}/.codex"
+fi
+
+mkdir -p "$WORKDIR" "$EXT_DIR" "$USER_DATA_DIR" "${HOME}/.config/code-server" "$CODEX_DIR"
+
+# -------------------------
+# code-server 配置
+# -------------------------
+cat > "${HOME}/.config/code-server/config.yaml" <<EOF
+bind-addr: 0.0.0.0:${PORT}
+auth: password
+cert: false
+EOF
+
+if [[ -n "${HASHED_PASSWORD:-}" ]]; then
+  echo "hashed-password: ${HASHED_PASSWORD}" >> "${HOME}/.config/code-server/config.yaml"
+else
+  echo "password: ${PASSWORD}" >> "${HOME}/.config/code-server/config.yaml"
+fi
+
+# -------------------------
+# Codex config.toml（默认使用你给的配置）
+# -------------------------
+: "${CODEX_MODEL_PROVIDER:=sub2api}"
+: "${CODEX_MODEL:=gpt-5.3-codex}"
+: "${CODEX_REASONING_EFFORT:=high}"
+: "${CODEX_NETWORK_ACCESS:=enabled}"
+: "${CODEX_DISABLE_RESPONSE_STORAGE:=true}"
+: "${CODEX_WSL_ACK:=true}"
+: "${CODEX_VERBOSITY:=high}"
+
+: "${CODEX_PROVIDER_NAME:=sub2api}"
+: "${CODEX_BASE_URL:=https://ai.qaq.al}"
+: "${CODEX_WIRE_API:=responses}"
+: "${CODEX_REQUIRES_OPENAI_AUTH:=true}"
+
+cat > "${CODEX_DIR}/config.toml" <<EOF
+model_provider = "${CODEX_MODEL_PROVIDER}"
+model = "${CODEX_MODEL}"
+model_reasoning_effort = "${CODEX_REASONING_EFFORT}"
+network_access = "${CODEX_NETWORK_ACCESS}"
+disable_response_storage = ${CODEX_DISABLE_RESPONSE_STORAGE}
+windows_wsl_setup_acknowledged = ${CODEX_WSL_ACK}
+model_verbosity = "${CODEX_VERBOSITY}"
+
+[model_providers.${CODEX_PROVIDER_NAME}]
+name = "${CODEX_PROVIDER_NAME}"
+base_url = "${CODEX_BASE_URL}"
+wire_api = "${CODEX_WIRE_API}"
+requires_openai_auth = ${CODEX_REQUIRES_OPENAI_AUTH}
+EOF
+
+# -------------------------
+# Codex auth.json（只从 Secrets 生成，不要写死到仓库）
+# -------------------------
+if [[ -n "${CODEX_AUTH_JSON:-}" ]]; then
+  printf '%s\n' "${CODEX_AUTH_JSON}" > "${CODEX_DIR}/auth.json"
+elif [[ -n "${OPENAI_API_KEY:-}" ]]; then
+  cat > "${CODEX_DIR}/auth.json" <<EOF
+{
+  "OPENAI_API_KEY": "${OPENAI_API_KEY}"
+}
+EOF
+else
+  echo "[WARN] OPENAI_API_KEY / CODEX_AUTH_JSON not found. auth.json not generated."
+fi
+
+chmod 600 "${CODEX_DIR}/config.toml" 2>/dev/null || true
+chmod 600 "${CODEX_DIR}/auth.json" 2>/dev/null || true
+
+# 若走 /data，软链到 ~/.codex
+if [[ "${CODEX_DIR}" != "${HOME}/.codex" ]]; then
+  rm -rf "${HOME}/.codex"
+  ln -s "${CODEX_DIR}" "${HOME}/.codex"
+fi
+
+echo "[INFO] Java:   $(java -version 2>&1 | head -n1 || true)"
+echo "[INFO] Python: $(python --version || true)"
+echo "[INFO] Pip:    $(pip --version || true)"
+echo "[INFO] Node:   $(node --version || true)"
+echo "[INFO] g++:    $(g++ --version | head -n1 || true)"
+
+exec code-server "$WORKDIR" \
+  --extensions-dir "$EXT_DIR" \
+  --user-data-dir "$USER_DATA_DIR" \
   --disable-telemetry