move main.go to wssocks-ustb directory

genshen · Mar 9, 2019 · a8464ad · a8464ad
1 parent 18d6190
commit a8464ad
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -1,17 +1,19 @@
-wssocks-ustb:
-	go build -o wssocks-ustb
+PACKAGE=github.com/genshen/wssocks-plugin-ustb/wssocks-ustb
+
+# wssocks-ustb:
+#	go build -o wssocks-ustb
 
 all: wssocks-ustb-linux-amd64 wssocks-ustb-darwin-amd64 wssocks-ustb-windows-amd64.exe
 
 wssocks-ustb-linux-amd64:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o wssocks-ustb-linux-amd64
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o wssocks-ustb-linux-amd64  ${PACKAGE}
 
 wssocks-ustb-darwin-amd64:
-	CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o wssocks-ustb-darwin-amd64
+	CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o wssocks-ustb-darwin-amd64  ${PACKAGE}
 
 wssocks-ustb-windows-amd64.exe:
-	CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o wssocks-ustb-windows-amd64.exe
+	CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o wssocks-ustb-windows-amd64.exe  ${PACKAGE}
 
 
 clean:
-	rm wssocks-ustb wssocks-ustb-linux-amd64 wssocks-ustb-darwin-amd64 wssocks-ustb-windows-amd64.exe
+	rm -f wssocks-ustb-linux-amd64 wssocks-ustb-darwin-amd64 wssocks-ustb-windows-amd64.exe
diff --git a/README.md b/README.md
@@ -9,7 +9,8 @@ See more about wssocks: https://github.com/genshen/wssocks.
 
 ## install
 ```bash
-go get -u github.com/genshen/wssocks-plugin-ustb
+go get -u github.com/genshen/wssocks-plugin-ustb/wssocks-ustb
+wssocks-ustb --help
 ```
 
 Or download from [release](https://github.com/genshen/wssocks-plugin-ustb/release) page.

diff --git a/main.go → wssocks-ustb/main.go b/main.go → wssocks-ustb/main.go
@@ -2,13 +2,13 @@ package main
 
 import (
 	"github.com/genshen/cmds"
+	"github.com/genshen/wssocks-plugin-ustb/vpn_plugin"
 	"github.com/genshen/wssocks/client"
 	_ "github.com/genshen/wssocks/client"
 	_ "github.com/genshen/wssocks/server"
 	"log"
 	//_ "github.com/genshen/wssocks/version"
-	_ "github.com/genshen/wssocks-plugin-ustb/version"
-	"github.com/genshen/wssocks-plugin-ustb/vpn_plugin"
+	_ "github.com/genshen/wssocks-plugin-ustb/wssocks-ustb/version"
 )
 
 // initialize USTB vpn (n.ustb.edu.cn) plugin

diff --git a/version/version.go → wssocks-ustb/version/version.go b/version/version.go → wssocks-ustb/version/version.go