fix non-root android & compile with golang 1.20.4

QGB · May 15, 2023 · 08ecf52 · 08ecf52
1 parent bdaad33
commit 08ecf52
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/build.sh b/build.sh
@@ -2,7 +2,10 @@ set -x  # ECHO on
 #go get github.com/google/shlex github.com/gliderlabs/ssh
 export GOPROXY=https://goproxy.cn
 go get
-export CGO_ENABLED=0 GOOS=linux GOARCH=arm64 ;go build -trimpath -ldflags "-s -w -buildid=" -o sshd-${GOOS}-$GOARCH
-export CGO_ENABLED=0 GOOS=linux GOARCH=arm   ;go build -trimpath -ldflags "-s -w -buildid=" -o sshd-${GOOS}-$GOARCH
-export CGO_ENABLED=0 GOOS=linux GOARCH=amd64 ;go build -trimpath -ldflags "-s -w -buildid=" -o sshd-${GOOS}-$GOARCH
 
+export BUILD_COMMAND='go build -trimpath -ldflags "-s -w -buildid=" -buildvcs=false -o'
+#golang 1.20  -buildvcs=false 
+
+export CGO_ENABLED=0 GOOS=linux GOARCH=amd64 ;eval $BUILD_COMMAND sshd-$GOOS-$GOARCH
+export CGO_ENABLED=0 GOOS=linux GOARCH=arm   ;eval $BUILD_COMMAND sshd-$GOOS-$GOARCH
+export CGO_ENABLED=0 GOOS=linux GOARCH=arm64 ;eval $BUILD_COMMAND sshd-$GOOS-$GOARCH
diff --git a/sshd.go b/sshd.go
@@ -25,8 +25,8 @@ func main() {
 		_, err := os.Stat(scmd)
 		if os.IsNotExist(err) {
 			scmd="/data/data/com.termux/files/usr/bin/bash"
-			_, err := os.Stat(scmd)
-			if os.IsNotExist(err) {
+			_, err := os.Open(scmd)//fix os.Stat(scmd)
+			if err != nil {
 				scmd="/system/bin/sh"
 			}