diff --git a/profiles/mac/profile b/profiles/mac/profile index 8fe2eab..4bd62cd 100644 --- a/profiles/mac/profile +++ b/profiles/mac/profile @@ -2,10 +2,18 @@ alias l='ls -lhF' alias ll=l alias la='ls -AlhF' -export PS1='%(?:%{%}%1{➜%} :%{%}%1{➜%} ) %{%}%~%{%} $(git_prompt_info)' -export PATH=$PATH:/Users/gaofei/Projects/github.com/magic/scripts -export PATH="/usr/local/opt/node@20/bin:$PATH" +export http_proxyserver="http://127.0.0.1:10809" -export HOMEBREW_BREW_GIT_REMOTE="https://mirrors.tuna.tsinghua.edu.cn/git/homebrew/brew.git" -export HOMEBREW_API_DOMAIN="https://mirrors.tuna.tsinghua.edu.cn/homebrew-bottles/api" -export HOMEBREW_BOTTLE_DOMAIN="https://mirrors.tuna.tsinghua.edu.cn/homebrew-bottles" +function set-proxy() { + if [[ $1 == "on" ]]; then + export HTTP_PROXY=$http_proxyserver + export HTTPS_PROXY=$http_proxyserver + elif [[ $1 == "off" ]]; then + unset HTTP_PROXY HTTPS_PROXY + fi + + echo + echo "HTTP_PROXY=$HTTP_PROXY" + echo "HTTPS_PROXY=$HTTPS_PROXY" + echo +} \ No newline at end of file diff --git a/scripts/_set_proxy b/scripts/_set_proxy deleted file mode 100644 index f1fb27c..0000000 --- a/scripts/_set_proxy +++ /dev/null @@ -1,2 +0,0 @@ -export HTTP_PROXY="http://localhost:28080" -export HTTPS_PROXY="http://localhost:28080" diff --git a/scripts/set-proxy b/scripts/set-proxy deleted file mode 100755 index 07561b2..0000000 --- a/scripts/set-proxy +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -function show() { - echo - echo "HTTP_PROXY=$HTTP_PROXY" - echo "HTTPS_PROXY=$HTTPS_PROXY" - echo -} - -function main() { - if [[ $1 == "on" ]]; then - DIR="$(dirname "${BASH_SOURCE[0]}")" - source $DIR/_set_proxy - elif [[ $1 == "off" ]]; then - unset HTTP_PROXY - unset HTTPS_PROXY - fi - - show -} - -main $@ diff --git a/x/README.md b/x/README.md index f5ad76f..546db5f 100644 --- a/x/README.md +++ b/x/README.md @@ -1,9 +1,12 @@ +# Verion 0.2 + ## QUICK START -1. Set variable: `DEPLOY_DOMAIN` +1. Set variable: `DEPLOY_DOMAIN` and `TAG` ```shell export DEPLOY_DOMAIN=xxx.xxx +export TAG=v0.2 ``` 2. Start diff --git a/x/quick_server.sh b/x/quick_server.sh index 4784c09..973c1ce 100644 --- a/x/quick_server.sh +++ b/x/quick_server.sh @@ -74,8 +74,8 @@ HY_CONFIG_FILE="${WORKING_DIR}/hy-config.yaml" CADDY_CONFIG_FILE="${WORKING_DIR}/Caddyfile" echo -e "[INFO] Download ${GREEN}hysteria${NC} and ${GREEN}caddy${NC} ..." -curl -L -o /usr/local/bin/hysteria $hysteria_download_url && - curl -L -o /usr/local/bin/caddy $caddy_download_url && +curl -L -o /usr/local/bin/hysteria $hysteria_download_url && \ + curl -L -o /usr/local/bin/caddy $caddy_download_url && \ chmod +x /usr/local/bin/hysteria /usr/local/bin/caddy echo -e "[INFO] Download Done\n"