Remove uneeded vars

offsoc · Jun 11, 2023 · ea0f4e4 · ea0f4e4
1 parent 6dadd92
commit ea0f4e4
Showing 2 changed files with 64 additions and 66 deletions.
diff --git a/Makefile b/Makefile
@@ -155,11 +155,11 @@ clients: clean .downloaded_assets validate-go-version
 
 .PHONY: servers
 servers: 
-	GOOS=windows GOARCH=amd64 $(ENV) CGO_ENABLED=$(CGO_ENABLED) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server_windows-amd64$(ARTIFACT_SUFFIX).exe ./server
-	GOOS=linux GOARCH=amd64 $(ENV) CGO_ENABLED=$(CGO_ENABLED) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server_linux-amd64$(ARTIFACT_SUFFIX) ./server
-	GOOS=linux GOARCH=arm64 $(ENV) CGO_ENABLED=$(CGO_ENABLED) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server_linux-arm64$(ARTIFACT_SUFFIX) ./server
-	GOOS=darwin GOARCH=arm64 $(ENV) CGO_ENABLED=$(CGO_ENABLED) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server_darwin-arm64$(ARTIFACT_SUFFIX) ./server
-	GOOS=darwin GOARCH=amd64 $(ENV) CGO_ENABLED=$(CGO_ENABLED) $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server_darwin-amd64$(ARTIFACT_SUFFIX) ./server
+	GOOS=windows GOARCH=amd64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server_windows-amd64$(ARTIFACT_SUFFIX).exe ./server
+	GOOS=linux GOARCH=amd64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server_linux-amd64$(ARTIFACT_SUFFIX) ./server
+	GOOS=linux GOARCH=arm64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server_linux-arm64$(ARTIFACT_SUFFIX) ./server
+	GOOS=darwin GOARCH=arm64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server_darwin-arm64$(ARTIFACT_SUFFIX) ./server
+	GOOS=darwin GOARCH=amd64 $(ENV) CGO_ENABLED=0 $(GO) build -mod=vendor -trimpath $(TAGS),server $(LDFLAGS) -o sliver-server_darwin-amd64$(ARTIFACT_SUFFIX) ./server
 
 .PHONY: pb
 pb:

diff --git a/go-assets.sh b/go-assets.sh
@@ -24,8 +24,6 @@ GO_VER="1.20.4"
 GARBLE_VER="1.20.4a"
 SGN_VER="0.0.3"
 
-GO_ARCH_1="amd64"
-GO_ARCH_2="arm64"
 BLOAT_FILES="AUTHORS CONTRIBUTORS PATENTS VERSION favicon.ico robots.txt SECURITY.md CONTRIBUTING.md LICENSE README.md ./doc ./test ./api ./misc"
 
 if ! [ -x "$(command -v curl)" ]; then
@@ -59,136 +57,136 @@ echo "-----------------------------------------------------------------"
 cd $WORK_DIR
 
 # --- Darwin (amd64) --- 
-curl --output go$GO_VER.darwin-$GO_ARCH_1.tar.gz https://dl.google.com/go/go$GO_VER.darwin-$GO_ARCH_1.tar.gz
-tar xvf go$GO_VER.darwin-$GO_ARCH_1.tar.gz
+curl --output go$GO_VER.darwin-amd64.tar.gz https://dl.google.com/go/go$GO_VER.darwin-amd64.tar.gz
+tar xvf go$GO_VER.darwin-amd64.tar.gz
 
 cd go
 rm -rf $BLOAT_FILES
 zip -r ../src.zip ./src  # Zip up /src we only need to do this once
 rm -rf ./src
-rm -f ./pkg/tool/darwin_$GO_ARCH_1/doc
-rm -f ./pkg/tool/darwin_$GO_ARCH_1/tour
-rm -f ./pkg/tool/darwin_$GO_ARCH_1/test2json
+rm -f ./pkg/tool/darwin_amd64/doc
+rm -f ./pkg/tool/darwin_amd64/tour
+rm -f ./pkg/tool/darwin_amd64/test2json
 cd ..
 cp -vv src.zip $OUTPUT_DIR/src.zip
 rm -f src.zip
 
 zip -r darwin-go.zip ./go
-mkdir -p $OUTPUT_DIR/darwin/$GO_ARCH_1
-cp -vv darwin-go.zip $OUTPUT_DIR/darwin/$GO_ARCH_1/go.zip
+mkdir -p $OUTPUT_DIR/darwin/amd64
+cp -vv darwin-go.zip $OUTPUT_DIR/darwin/amd64/go.zip
 
 rm -rf ./go
-rm -f darwin-go.zip go$GO_VER.darwin-$GO_ARCH_1.tar.gz
+rm -f darwin-go.zip go$GO_VER.darwin-amd64.tar.gz
 
 # --- Darwin (arm64) --- 
-curl --output go$GO_VER.darwin-$GO_ARCH_2.tar.gz https://dl.google.com/go/go$GO_VER.darwin-$GO_ARCH_2.tar.gz
-tar xvf go$GO_VER.darwin-$GO_ARCH_2.tar.gz
+curl --output go$GO_VER.darwin-arm64.tar.gz https://dl.google.com/go/go$GO_VER.darwin-arm64.tar.gz
+tar xvf go$GO_VER.darwin-arm64.tar.gz
 
 cd go
 rm -rf $BLOAT_FILES
 zip -r ../src.zip ./src  # Zip up /src we only need to do this once
 rm -rf ./src
-rm -f ./pkg/tool/darwin_$GO_ARCH_2/doc
-rm -f ./pkg/tool/darwin_$GO_ARCH_2/tour
-rm -f ./pkg/tool/darwin_$GO_ARCH_2/test2json
+rm -f ./pkg/tool/darwin_arm64/doc
+rm -f ./pkg/tool/darwin_arm64/tour
+rm -f ./pkg/tool/darwin_arm64/test2json
 cd ..
 cp -vv src.zip $OUTPUT_DIR/src.zip
 rm -f src.zip
 
 zip -r darwin-go.zip ./go
-mkdir -p $OUTPUT_DIR/darwin/$GO_ARCH_2
-cp -vv darwin-go.zip $OUTPUT_DIR/darwin/$GO_ARCH_2/go.zip
+mkdir -p $OUTPUT_DIR/darwin/arm64
+cp -vv darwin-go.zip $OUTPUT_DIR/darwin/arm64/go.zip
 
 rm -rf ./go
-rm -f darwin-go.zip go$GO_VER.darwin-$GO_ARCH_2.tar.gz
+rm -f darwin-go.zip go$GO_VER.darwin-arm64.tar.gz
 
 # --- Linux (amd64) --- 
-curl --output go$GO_VER.linux-$GO_ARCH_1.tar.gz https://dl.google.com/go/go$GO_VER.linux-$GO_ARCH_1.tar.gz
-tar xvf go$GO_VER.linux-$GO_ARCH_1.tar.gz
+curl --output go$GO_VER.linux-amd64.tar.gz https://dl.google.com/go/go$GO_VER.linux-amd64.tar.gz
+tar xvf go$GO_VER.linux-amd64.tar.gz
 cd go
 rm -rf $BLOAT_FILES
 rm -rf ./src
-rm -f ./pkg/tool/linux_$GO_ARCH_1/doc
-rm -f ./pkg/tool/linux_$GO_ARCH_1/tour
-rm -f ./pkg/tool/linux_$GO_ARCH_1/test2json
+rm -f ./pkg/tool/linux_amd64/doc
+rm -f ./pkg/tool/linux_amd64/tour
+rm -f ./pkg/tool/linux_amd64/test2json
 cd ..
 zip -r linux-go.zip ./go
-mkdir -p $OUTPUT_DIR/linux/$GO_ARCH_1
-cp -vv linux-go.zip $OUTPUT_DIR/linux/$GO_ARCH_1/go.zip
+mkdir -p $OUTPUT_DIR/linux/amd64
+cp -vv linux-go.zip $OUTPUT_DIR/linux/amd64/go.zip
 rm -rf ./go
-rm -f linux-go.zip go$GO_VER.linux-$GO_ARCH_1.tar.gz
+rm -f linux-go.zip go$GO_VER.linux-amd64.tar.gz
 
 # --- Linux (arm64) --- 
-curl --output go$GO_VER.linux-$GO_ARCH_2.tar.gz https://dl.google.com/go/go$GO_VER.linux-$GO_ARCH_2.tar.gz
-tar xvf go$GO_VER.linux-$GO_ARCH_2.tar.gz
+curl --output go$GO_VER.linux-arm64.tar.gz https://dl.google.com/go/go$GO_VER.linux-arm64.tar.gz
+tar xvf go$GO_VER.linux-arm64.tar.gz
 cd go
 rm -rf $BLOAT_FILES
 rm -rf ./src
-rm -f ./pkg/tool/linux_$GO_ARCH_2/doc
-rm -f ./pkg/tool/linux_$GO_ARCH_2/tour
-rm -f ./pkg/tool/linux_$GO_ARCH_2/test2json
+rm -f ./pkg/tool/linux_arm64/doc
+rm -f ./pkg/tool/linux_arm64/tour
+rm -f ./pkg/tool/linux_arm64/test2json
 cd ..
 zip -r linux-go.zip ./go
-mkdir -p $OUTPUT_DIR/linux/$GO_ARCH_2
-cp -vv linux-go.zip $OUTPUT_DIR/linux/$GO_ARCH_2/go.zip
+mkdir -p $OUTPUT_DIR/linux/arm64
+cp -vv linux-go.zip $OUTPUT_DIR/linux/arm64/go.zip
 rm -rf ./go
-rm -f linux-go.zip go$GO_VER.linux-$GO_ARCH_2.tar.gz
+rm -f linux-go.zip go$GO_VER.linux-arm64.tar.gz
 
 # --- Windows --- 
-curl --output go$GO_VER.windows-amd64.zip https://dl.google.com/go/go$GO_VER.windows-$GO_ARCH_1.zip
+curl --output go$GO_VER.windows-amd64.zip https://dl.google.com/go/go$GO_VER.windows-amd64.zip
 unzip go$GO_VER.windows-amd64.zip
 cd go
 rm -rf $BLOAT_FILES
 rm -rf ./src
-rm -f ./pkg/tool/windows_$GO_ARCH_1/doc.exe
-rm -f ./pkg/tool/windows_$GO_ARCH_1/tour.exe
-rm -f ./pkg/tool/windows_$GO_ARCH_1/test2json.exe
+rm -f ./pkg/tool/windows_amd64/doc.exe
+rm -f ./pkg/tool/windows_amd64/tour.exe
+rm -f ./pkg/tool/windows_amd64/test2json.exe
 cd ..
 zip -r windows-go.zip ./go
-mkdir -p $OUTPUT_DIR/windows/$GO_ARCH_1
-cp -vv windows-go.zip $OUTPUT_DIR/windows/$GO_ARCH_1/go.zip
+mkdir -p $OUTPUT_DIR/windows/amd64
+cp -vv windows-go.zip $OUTPUT_DIR/windows/amd64/go.zip
 rm -rf ./go
-rm -f windows-go.zip go$GO_VER.windows-$GO_ARCH_1.zip
+rm -f windows-go.zip go$GO_VER.windows-amd64.zip
 
 echo "-----------------------------------------------------------------"
 echo " Garble"
 echo "-----------------------------------------------------------------"
 
-echo "curl -L --fail --output $OUTPUT_DIR/linux/$GO_ARCH_1/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_linux"
-curl -L --fail --output $OUTPUT_DIR/linux/$GO_ARCH_1/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_linux
-echo "curl -L --fail --output $OUTPUT_DIR/linux/$GO_ARCH_2/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_linux-$GO_ARCH_2"
-curl -L --fail --output $OUTPUT_DIR/linux/$GO_ARCH_2/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_linux-$GO_ARCH_2
-echo "curl -L --fail --output $OUTPUT_DIR/windows/$GO_ARCH_1/garble.exe https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_windows.exe"
-curl -L --fail --output $OUTPUT_DIR/windows/$GO_ARCH_1/garble.exe https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_windows.exe
-echo "curl -L --fail --output $OUTPUT_DIR/darwin/$GO_ARCH_1/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_macos-$GO_ARCH_1"
-curl -L --fail --output $OUTPUT_DIR/darwin/$GO_ARCH_1/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_macos-$GO_ARCH_1
-echo "curl -L --fail --output $OUTPUT_DIR/darwin/$GO_ARCH_2/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_macos-$GO_ARCH_2"
-curl -L --fail --output $OUTPUT_DIR/darwin/$GO_ARCH_2/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_macos-$GO_ARCH_2
+echo "curl -L --fail --output $OUTPUT_DIR/linux/amd64/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_linux"
+curl -L --fail --output $OUTPUT_DIR/linux/amd64/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_linux
+echo "curl -L --fail --output $OUTPUT_DIR/linux/arm64/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_linux-arm64"
+curl -L --fail --output $OUTPUT_DIR/linux/arm64/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_linux-arm64
+echo "curl -L --fail --output $OUTPUT_DIR/windows/amd64/garble.exe https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_windows.exe"
+curl -L --fail --output $OUTPUT_DIR/windows/amd64/garble.exe https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_windows.exe
+echo "curl -L --fail --output $OUTPUT_DIR/darwin/amd64/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_macos-amd64"
+curl -L --fail --output $OUTPUT_DIR/darwin/amd64/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_macos-amd64
+echo "curl -L --fail --output $OUTPUT_DIR/darwin/arm64/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_macos-arm64"
+curl -L --fail --output $OUTPUT_DIR/darwin/arm64/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_macos-arm64
 
 
 echo "-----------------------------------------------------------------"
 echo " Shikata ga nai (ノ ゜Д゜)ノ ︵ 仕方がない"
 echo "-----------------------------------------------------------------"
 
 # Linux (amd64)
-echo "curl -L --fail --output $OUTPUT_DIR/linux/$GO_ARCH_1/sgn.zip https://github.com/moloch--/sgn/releases/download/v$SGN_VER/sgn_linux-$GO_ARCH_1.zip"
-curl -L --fail --output $OUTPUT_DIR/linux/$GO_ARCH_1/sgn.zip https://github.com/moloch--/sgn/releases/download/v$SGN_VER/sgn_linux-$GO_ARCH_1.zip
+echo "curl -L --fail --output $OUTPUT_DIR/linux/amd64/sgn.zip https://github.com/moloch--/sgn/releases/download/v$SGN_VER/sgn_linux-amd64.zip"
+curl -L --fail --output $OUTPUT_DIR/linux/amd64/sgn.zip https://github.com/moloch--/sgn/releases/download/v$SGN_VER/sgn_linux-amd64.zip
 
 # Linux (arm64)
-echo "curl -L --fail --output $OUTPUT_DIR/linux/$GO_ARCH_2/sgn.zip https://github.com/moloch--/sgn/releases/download/v$SGN_VER/sgn_linux-$GO_ARCH_2.zip"
-curl -L --fail --output $OUTPUT_DIR/linux/$GO_ARCH_2/sgn.zip https://github.com/moloch--/sgn/releases/download/v$SGN_VER/sgn_linux-$GO_ARCH_2.zip
+echo "curl -L --fail --output $OUTPUT_DIR/linux/arm64/sgn.zip https://github.com/moloch--/sgn/releases/download/v$SGN_VER/sgn_linux-arm64.zip"
+curl -L --fail --output $OUTPUT_DIR/linux/arm64/sgn.zip https://github.com/moloch--/sgn/releases/download/v$SGN_VER/sgn_linux-arm64.zip
 
 # Windows (amd64)
-echo "curl -L --fail --output $OUTPUT_DIR/windows/$GO_ARCH_1/sgn.zip https://github.com/moloch--/sgn/releases/download/v$SGN_VER/sgn_windows-$GO_ARCH_1.zip"
-curl -L --fail --output $OUTPUT_DIR/windows/$GO_ARCH_1/sgn.zip https://github.com/moloch--/sgn/releases/download/v$SGN_VER/sgn_windows-$GO_ARCH_1.zip
+echo "curl -L --fail --output $OUTPUT_DIR/windows/amd64/sgn.zip https://github.com/moloch--/sgn/releases/download/v$SGN_VER/sgn_windows-amd64.zip"
+curl -L --fail --output $OUTPUT_DIR/windows/amd64/sgn.zip https://github.com/moloch--/sgn/releases/download/v$SGN_VER/sgn_windows-amd64.zip
 
 # MacOS (amd64)
-echo "curl -L --fail --output $OUTPUT_DIR/darwin/$GO_ARCH_1/sgn.zip https://github.com/moloch--/sgn/releases/download/v$SGN_VER/sgn_macos-$GO_ARCH_1.zip"
-curl -L --fail --output $OUTPUT_DIR/darwin/$GO_ARCH_1/sgn.zip https://github.com/moloch--/sgn/releases/download/v$SGN_VER/sgn_macos-$GO_ARCH_1.zip
+echo "curl -L --fail --output $OUTPUT_DIR/darwin/amd64/sgn.zip https://github.com/moloch--/sgn/releases/download/v$SGN_VER/sgn_macos-amd64.zip"
+curl -L --fail --output $OUTPUT_DIR/darwin/amd64/sgn.zip https://github.com/moloch--/sgn/releases/download/v$SGN_VER/sgn_macos-amd64.zip
 
 # MacOS (arm64)
-echo "curl -L --fail --output $OUTPUT_DIR/darwin/$GO_ARCH_2/sgn.zip https://github.com/moloch--/sgn/releases/download/v$SGN_VER/sgn_macos-$GO_ARCH_2.zip"
-curl -L --fail --output $OUTPUT_DIR/darwin/$GO_ARCH_2/sgn.zip https://github.com/moloch--/sgn/releases/download/v$SGN_VER/sgn_macos-$GO_ARCH_2.zip
+echo "curl -L --fail --output $OUTPUT_DIR/darwin/arm64/sgn.zip https://github.com/moloch--/sgn/releases/download/v$SGN_VER/sgn_macos-arm64.zip"
+curl -L --fail --output $OUTPUT_DIR/darwin/arm64/sgn.zip https://github.com/moloch--/sgn/releases/download/v$SGN_VER/sgn_macos-arm64.zip
 
 # end
 echo -e "clean up: $WORK_DIR"