Skip to content

Commit

Permalink
Removed 3rd patry assets
Browse files Browse the repository at this point in the history
  • Loading branch information
moloch-- committed Mar 6, 2021
1 parent d72c1d2 commit f5a3c57
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 30 deletions.
18 changes: 0 additions & 18 deletions go-assets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -141,24 +141,6 @@ curl -L --output $OUTPUT_DIR/windows/$GO_ARCH_1/garble.exe https://github.com/mo
curl -L --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 --output $OUTPUT_DIR/darwin/$GO_ARCH_2/garble https://github.com/moloch--/garble/releases/download/v$GARBLE_VER/garble_macos-$GO_ARCH_2

echo "-----------------------------------------------------------------"
echo " 3rd Party Assets"
echo "-----------------------------------------------------------------"
cd $WORK_DIR

curl -L --output $PROTOBUF_COMMIT.zip https://github.com/golang/protobuf/archive/$PROTOBUF_COMMIT.zip
unzip $PROTOBUF_COMMIT.zip
rm -f $PROTOBUF_COMMIT.zip
mv protobuf-$PROTOBUF_COMMIT protobuf
zip -r protobuf.zip ./protobuf
cp -vv protobuf.zip $OUTPUT_DIR/protobuf.zip

curl -L --output $GOLANG_SYS_COMMIT.tar.gz https://github.com/golang/sys/archive/$GOLANG_SYS_COMMIT.tar.gz
tar xfv $GOLANG_SYS_COMMIT.tar.gz
rm -f $GOLANG_SYS_COMMIT.tar.gz
mv sys-$GOLANG_SYS_COMMIT sys
zip -r $OUTPUT_DIR/golang_x_sys.zip sys

# end
echo -e "clean up: $WORK_DIR"
rm -rf $WORK_DIR
Expand Down
12 changes: 0 additions & 12 deletions server/assets/assets.go
Original file line number Diff line number Diff line change
Expand Up @@ -212,18 +212,6 @@ func SetupGoPath(goPathSrc string) error {
os.MkdirAll(commonpbDir, 0700)
ioutil.WriteFile(path.Join(commonpbDir, "common.pb.go"), commonpbSrc, 0644)

// GOPATH 3rd party dependencies
protobufPath := path.Join(goPathSrc, "github.com", "golang")
err = unzipGoDependency("fs/protobuf.zip", protobufPath)
if err != nil {
setupLog.Fatalf("Failed to unzip go dependency: %v", err)
}
golangXPath := path.Join(goPathSrc, "golang.org", "x")
err = unzipGoDependency("fs/golang_x_sys.zip", golangXPath)
if err != nil {
setupLog.Fatalf("Failed to unzip go dependency: %v", err)
}

return nil
}

Expand Down

0 comments on commit f5a3c57

Please sign in to comment.