From 4b37c6bb2bfb73c94f8da353e4ad33d831b9d584 Mon Sep 17 00:00:00 2001
From: wjqserver <114663932+WJQSERVER@users.noreply.github.com>
Date: Sat, 29 Mar 2025 12:01:46 +0800
Subject: [PATCH] depr -cfg flag & change to -c

---
 deploy/config.toml                   |  1 +
 deploy/ghproxy.service               |  2 +-
 deploy/install-dev.sh                |  2 +-
 deploy/install.sh                    |  2 +-
 docker/dockerfile/dev/Dockerfile     | 12 +++++++++---
 docker/dockerfile/release/Dockerfile | 14 ++++++++++----
 main.go                              | 13 +++++++++++--
 7 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/deploy/config.toml b/deploy/config.toml
index e3f15aa..1c7e69a 100644
--- a/deploy/config.toml
+++ b/deploy/config.toml
@@ -19,6 +19,7 @@ ForceH2C = false
 
 [shell]
 editor = false
+rewriteAPI = false
 
 [pages]
 mode = "internal" # "internal" or "external"
diff --git a/deploy/ghproxy.service b/deploy/ghproxy.service
index df85e32..224ce31 100644
--- a/deploy/ghproxy.service
+++ b/deploy/ghproxy.service
@@ -3,7 +3,7 @@ Description=Github Proxy Service
 After=network.target
 
 [Service]
-ExecStart=/bin/bash -c '/usr/local/ghproxy/ghproxy -cfg /usr/local/ghproxy/config/config.toml > /usr/local/ghproxy/log/run.log 2>&1'
+ExecStart=/bin/bash -c '/usr/local/ghproxy/ghproxy -c /usr/local/ghproxy/config/config.toml > /usr/local/ghproxy/log/run.log 2>&1'
 WorkingDirectory=/usr/local/ghproxy
 Restart=always
 User=root
diff --git a/deploy/install-dev.sh b/deploy/install-dev.sh
index 24c8cf0..a949110 100644
--- a/deploy/install-dev.sh
+++ b/deploy/install-dev.sh
@@ -123,7 +123,7 @@ Description=Github Proxy Service
 After=network.target
 
 [Service]
-ExecStart=/bin/bash -c '$ghproxy_dir/ghproxy -cfg $ghproxy_dir/config/config.toml > $ghproxy_dir/log/run.log 2>&1'
+ExecStart=/bin/bash -c '$ghproxy_dir/ghproxy -c $ghproxy_dir/config/config.toml > $ghproxy_dir/log/run.log 2>&1'
 WorkingDirectory=$ghproxy_dir
 Restart=always
 User=root
diff --git a/deploy/install.sh b/deploy/install.sh
index f050a0b..c8a83c8 100644
--- a/deploy/install.sh
+++ b/deploy/install.sh
@@ -123,7 +123,7 @@ Description=Github Proxy Service
 After=network.target
 
 [Service]
-ExecStart=/bin/bash -c '$ghproxy_dir/ghproxy -cfg $ghproxy_dir/config/config.toml > $ghproxy_dir/log/run.log 2>&1'
+ExecStart=/bin/bash -c '$ghproxy_dir/ghproxy -c $ghproxy_dir/config/config.toml > $ghproxy_dir/log/run.log 2>&1'
 WorkingDirectory=$ghproxy_dir
 Restart=always
 User=root
diff --git a/docker/dockerfile/dev/Dockerfile b/docker/dockerfile/dev/Dockerfile
index 6e66dea..e300ce3 100644
--- a/docker/dockerfile/dev/Dockerfile
+++ b/docker/dockerfile/dev/Dockerfile
@@ -36,12 +36,18 @@ FROM alpine:latest
 
 RUN apk add --no-cache curl
 
+ARG USER=WJQSERVER-STUDIO
+ARG REPO=ghproxy
+ARG BRANCH=v3
+ARG APPLICATION=ghproxy
+ARG TARGETOS
+ARG TARGETARCH
+ARG TARGETPLATFORM
+
 COPY --from=builder /data/www /data/www
 COPY --from=builder /data/${APPLICATION} /data/${APPLICATION}
-COPY --from=builder /usr/local/bin/init.sh /usr/local/bin/init.sh
 
 # 权限
 RUN chmod +x /data/${APPLICATION}/${APPLICATION}
-RUN chmod +x /usr/local/bin/init.sh
 
-CMD ["/usr/local/bin/init.sh"]
\ No newline at end of file
+CMD ["/data/ghproxy/ghproxy"]
\ No newline at end of file
diff --git a/docker/dockerfile/release/Dockerfile b/docker/dockerfile/release/Dockerfile
index 6c8af34..8423afa 100644
--- a/docker/dockerfile/release/Dockerfile
+++ b/docker/dockerfile/release/Dockerfile
@@ -36,14 +36,20 @@ FROM alpine:latest
 
 RUN apk add --no-cache curl
 
+ARG USER=WJQSERVER-STUDIO
+ARG REPO=ghproxy
+ARG BRANCH=v3
+ARG APPLICATION=ghproxy
+ARG TARGETOS
+ARG TARGETARCH
+ARG TARGETPLATFORM
+
 COPY --from=builder /data/www /data/www
-#COPY --from=builder /data/caddy /data/caddy
 COPY --from=builder /data/${APPLICATION} /data/${APPLICATION}
-COPY --from=builder /usr/local/bin/init.sh /usr/local/bin/init.sh
 
 # 权限
 RUN chmod +x /data/${APPLICATION}/${APPLICATION}
-RUN chmod +x /usr/local/bin/init.sh
 
-CMD ["/usr/local/bin/init.sh"]
+CMD ["/data/ghproxy/ghproxy"]
+
 
diff --git a/main.go b/main.go
index 47e486b..04b9ee0 100644
--- a/main.go
+++ b/main.go
@@ -63,10 +63,19 @@ var (
 )
 
 func readFlag() {
-	flag.StringVar(&cfgfile, "cfg", configfile, "config file path")
+	flag.StringVar(&cfgfile, "c", configfile, "config file path")
+	flag.Func("cfg", "exit", func(s string) error {
+
+		// 被弃用的flag, fail退出
+		fmt.Printf("\n")
+		fmt.Println("[ERROR] cfg flag is deprecated, please use -c instead")
+		fmt.Printf("\n")
+		flag.Usage()
+		os.Exit(1)
+		return nil
+	})
 	flag.BoolVar(&showVersion, "v", false, "show version and exit")   // 添加-v标志
 	flag.BoolVar(&showHelp, "h", false, "show help message and exit") // 添加-h标志
-
 	// 捕获未定义的 flag
 	flag.Usage = func() {
 		fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])