This commit is contained in:
gaofei 2024-08-30 11:00:18 +08:00
parent 22091102dd
commit 4effa60c2a
2 changed files with 19 additions and 10 deletions

View File

@ -10,8 +10,16 @@ export DEPLOY_DOMAIN=xxx.xxx
#### server #### server
- Github:
```shell ```shell
curl -o- https://raw.githubusercontent.com/xxoommd/magic/main/x/quick_server.sh | bash bash <(curl -fsSL https://raw.githubusercontent.com/xxoommd/magic/main/x/quick_server.sh)
```
- Gitea:
```shell
bash <(curl -fsSL https://gitee.com/xxoommd/magic/raw/main/quick_server.sh)
``` ```
#### client #### client
@ -19,11 +27,11 @@ curl -o- https://raw.githubusercontent.com/xxoommd/magic/main/x/quick_server.sh
- Github: - Github:
```shell ```shell
curl -o- https://raw.githubusercontent.com/xxoommd/magic/main/quick_client.sh | bash TAG=latest bash <(curl -fsSL https://raw.githubusercontent.com/xxoommd/magic/main/quick_client.sh)
``` ```
- Gitea: - Gitea:
```shell ```shell
curl -o- https://gitee.com/xxoommd/magic/raw/main/quick_client.sh | bash TAG=latest bash <(curl -fsSL https://gitee.com/xxoommd/magic/raw/main/quick_client.sh)
``` ```

View File

@ -80,7 +80,7 @@ function download_naive() {
mv_cmd="mv /tmp/naiveproxy-${NAIVE_VERSION}-${OS_N}-${ARCH_N}/naive.exe $BIN_PATH/naive-${OS}-${ARCH}.exe" mv_cmd="mv /tmp/naiveproxy-${NAIVE_VERSION}-${OS_N}-${ARCH_N}/naive.exe $BIN_PATH/naive-${OS}-${ARCH}.exe"
fi fi
echo -e "- Downloading: ${target_name} ... ${YELLOW}$download_cmd${NC}" echo -e "- Downloading: ${target_name} ..."
eval $download_cmd && eval $decompress_cmd && eval $mv_cmd eval $download_cmd && eval $decompress_cmd && eval $mv_cmd
rm -rf /tmp/naive* rm -rf /tmp/naive*
@ -117,6 +117,7 @@ function main() {
if [[ $# -eq 0 ]]; then if [[ $# -eq 0 ]]; then
up_caddy=true up_caddy=true
up_hy=true up_hy=true
up_naive=true
fi fi
while [[ $# -gt 0 ]]; do while [[ $# -gt 0 ]]; do
@ -162,20 +163,20 @@ function main() {
fi fi
if [ "$up_hy" = true ]; then if [ "$up_hy" = true ]; then
echo -e "[INFO] Updating ${GREEN}hysteria2${NC} ..." echo -e "[INFO] Downloading ${GREEN}hysteria2${NC} ..."
if update_hysteria; then if update_hysteria; then
echo -e "[INFO] Updating ${GREEN}hysteria2${NC} success" echo -e "[INFO] Download ${GREEN}hysteria2${NC} success"
else else
echo -e "[Err] Updating ${GREEN}hysteria2${NC} fail" echo -e "[Err] Download ${GREEN}hysteria2${NC} fail"
exit 1 exit 1
fi fi
echo echo
fi fi
if [ "$up_naive" = true ]; then if [ "$up_naive" = true ]; then
echo -e "[INFO] Updating ${GREEN}naive${NC} ..." echo -e "[INFO] Downloading ${GREEN}naive${NC} ..."
if ! update_naive; then if ! update_naive; then
echo -e "[${RED}ERR${NC}] Update naive fail" echo -e "[${RED}ERR${NC}] Download naive fail"
fi fi
echo echo
fi fi