替换clashr为clash字段

.travis.yml

@@ -21,6 +21,6 @@ deploy:
   file: bin/*
   file_glob: true
   on:
-    repo: whojave/clashr
+    repo: whojave/clash
     branch: master
     tags: true

Makefile

@@ -1,9 +1,9 @@
-NAME=clashR
+NAME=clash
 BINDIR=bin
 VERSION=$(shell git describe --tags || echo "unknown version")
 BUILDTIME=$(shell date -u)
-GOBUILD=CGO_ENABLED=0 go build -ldflags '-X "github.com/whojave/clashr/constant.Version=$(VERSION)" \
-		-X "github.com/whojave/clashr/constant.BuildTime=$(BUILDTIME)" \
+GOBUILD=CGO_ENABLED=0 go build -ldflags '-X "github.com/whojave/clash/constant.Version=$(VERSION)" \
+		-X "github.com/whojave/clash/constant.BuildTime=$(BUILDTIME)" \
 		-w -s'
 
 PLATFORM_LIST = \

README.md

@@ -1,20 +1,20 @@
 <h1 align="center">
-  <img src="https://github.com/whojave/clashr/raw/master/docs/logo.png" alt="Clash" width="200">
+  <img src="https://github.com/whojave/clash/raw/master/docs/logo.png" alt="Clash" width="200">
   <br>Clash<br>
 </h1>
 
 <h4 align="center">A rule-based tunnel in Go.</h4>
 
 <p align="center">
-  <a href="https://travis-ci.org/whojave/clashr">
-    <img src="https://img.shields.io/travis/whojave/clashr.svg?style=flat-square"
+  <a href="https://travis-ci.org/whojave/clash">
+    <img src="https://img.shields.io/travis/whojave/clash.svg?style=flat-square"
          alt="Travis-CI">
   </a>
-  <a href="https://goreportcard.com/report/github.com/whojave/clashr">
-    <img src="https://goreportcard.com/badge/github.com/whojave/clashr?style=flat-square">
+  <a href="https://goreportcard.com/report/github.com/whojave/clash">
+    <img src="https://goreportcard.com/badge/github.com/whojave/clash?style=flat-square">
   </a>
-  <a href="https://github.com/whojave/clashr/releases">
-    <img src="https://img.shields.io/github/release/whojave/clashr/all.svg?style=flat-square">
+  <a href="https://github.com/whojave/clash/releases">
+    <img src="https://img.shields.io/github/release/whojave/clash/all.svg?style=flat-square">
   </a>
 </p>
 
@@ -32,10 +32,10 @@
 Clash Requires Go >= 1.13. You can build it from source:
 
 ```sh
-$ go get -u -v github.com/whojave/clashr
+$ go get -u -v github.com/whojave/clash
 ```
 
-Pre-built binaries are available here: [release](https://github.com/whojave/clashr/releases)
+Pre-built binaries are available here: [release](https://github.com/whojave/clash/releases)
 
 Check Clash version with:
 
@@ -57,7 +57,7 @@ $ pm2 start clash
 
 If you have Docker installed, you can run clash directly using `docker-compose`.
 
-[Run clash in docker](https://github.com/whojave/clashr/wiki/Run-clash-in-docker)
+[Run clash in docker](https://github.com/whojave/clash/wiki/Run-clash-in-docker)
 
 ## Config
 

adapters/inbound/http.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strings"
 
-	C "github.com/whojave/clashr/constant"
+	C "github.com/whojave/clash/constant"
 )
 
 // HTTPAdapter is a adapter for HTTP connection

adapters/inbound/https.go

@@ -4,7 +4,7 @@ import (
 	"net"
 	"net/http"
 
-	C "github.com/whojave/clashr/constant"
+	C "github.com/whojave/clash/constant"
 )
 
 // NewHTTPS is HTTPAdapter generator

adapters/inbound/socket.go

@@ -3,8 +3,8 @@ package adapters
 import (
 	"net"
 
-	"github.com/whojave/clashr/component/socks5"
-	C "github.com/whojave/clashr/constant"
+	"github.com/whojave/clash/component/socks5"
+	C "github.com/whojave/clash/constant"
 )
 
 // SocketAdapter is a adapter for socks and redir connection

adapters/inbound/util.go

@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/whojave/clashr/component/socks5"
-	C "github.com/whojave/clashr/constant"
+	"github.com/whojave/clash/component/socks5"
+	C "github.com/whojave/clash/constant"
 )
 
 func parseSocksAddr(target socks5.Addr) *C.Metadata {

adapters/outbound/base.go

@@ -8,8 +8,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/whojave/clashr/common/queue"
-	C "github.com/whojave/clashr/constant"
+	"github.com/whojave/clash/common/queue"
+	C "github.com/whojave/clash/constant"
 )
 
 var (

adapters/outbound/direct.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"net"
 
-	C "github.com/whojave/clashr/constant"
+	C "github.com/whojave/clash/constant"
 )
 
 type Direct struct {

adapters/outbound/fallback.go

@@ -9,8 +9,8 @@ import (
 	"time"
 
 
-	C "github.com/whojave/clashr/constant"
-	"github.com/whojave/clashr/common/picker"
+	C "github.com/whojave/clash/constant"
+	"github.com/whojave/clash/common/picker"
 )
 
 type Fallback struct {

adapters/outbound/http.go

@@ -13,7 +13,7 @@ import (
 	"net/http"
 	"strconv"
 
-	C "github.com/whojave/clashr/constant"
+	C "github.com/whojave/clash/constant"
 )
 
 type Http struct {

adapters/outbound/loadbalance.go

@@ -8,8 +8,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/whojave/clashr/common/murmur3"
-	C "github.com/whojave/clashr/constant"
+	"github.com/whojave/clash/common/murmur3"
+	C "github.com/whojave/clash/constant"
 
 	"golang.org/x/net/publicsuffix"
 )

adapters/outbound/reject.go

@@ -6,7 +6,7 @@ import (
 	"net"
 	"time"
 
-	C "github.com/whojave/clashr/constant"
+	C "github.com/whojave/clash/constant"
 )
 
 type Reject struct {

adapters/outbound/selector.go

@@ -6,7 +6,7 @@ import (
 	"errors"
 	"net"
 
-	C "github.com/whojave/clashr/constant"
+	C "github.com/whojave/clash/constant"
 )
 
 type Selector struct {

adapters/outbound/shadowsocks.go

@@ -8,11 +8,11 @@ import (
 	"net"
 	"strconv"
 
-	"github.com/whojave/clashr/common/structure"
-	obfs "github.com/whojave/clashr/component/simple-obfs"
-	"github.com/whojave/clashr/component/socks5"
-	v2rayObfs "github.com/whojave/clashr/component/v2ray-plugin"
-	C "github.com/whojave/clashr/constant"
+	"github.com/whojave/clash/common/structure"
+	obfs "github.com/whojave/clash/component/simple-obfs"
+	"github.com/whojave/clash/component/socks5"
+	v2rayObfs "github.com/whojave/clash/component/v2ray-plugin"
+	C "github.com/whojave/clash/constant"
 
 	"github.com/Dreamacro/go-shadowsocks2/core"
 )

adapters/outbound/shadowsocksr.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	C "github.com/whojave/clashr/constant"
+	C "github.com/whojave/clash/constant"
 	"github.com/whojave/gossr/obfs"
 	"github.com/whojave/gossr/protocol"
 	"net"

adapters/outbound/snell.go

@@ -6,10 +6,10 @@ import (
 	"net"
 	"strconv"
 
-	"github.com/whojave/clashr/common/structure"
-	obfs "github.com/whojave/clashr/component/simple-obfs"
-	"github.com/whojave/clashr/component/snell"
-	C "github.com/whojave/clashr/constant"
+	"github.com/whojave/clash/common/structure"
+	obfs "github.com/whojave/clash/component/simple-obfs"
+	"github.com/whojave/clash/component/snell"
+	C "github.com/whojave/clash/constant"
 )
 
 type Snell struct {

adapters/outbound/socks5.go

@@ -9,8 +9,8 @@ import (
 	"net"
 	"strconv"
 
-	"github.com/whojave/clashr/component/socks5"
-	C "github.com/whojave/clashr/constant"
+	"github.com/whojave/clash/component/socks5"
+	C "github.com/whojave/clash/constant"
 )
 
 type Socks5 struct {

adapters/outbound/urltest.go

@@ -8,8 +8,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/whojave/clashr/common/picker"
-	C "github.com/whojave/clashr/constant"
+	"github.com/whojave/clash/common/picker"
+	C "github.com/whojave/clash/constant"
 )
 
 type URLTest struct {

adapters/outbound/util.go

@@ -11,9 +11,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/whojave/clashr/component/socks5"
-	C "github.com/whojave/clashr/constant"
-	"github.com/whojave/clashr/dns"
+	"github.com/whojave/clash/component/socks5"
+	C "github.com/whojave/clash/constant"
+	"github.com/whojave/clash/dns"
 )
 
 const (

adapters/outbound/vmess.go

@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/whojave/clashr/component/vmess"
-	C "github.com/whojave/clashr/constant"
+	"github.com/whojave/clash/component/vmess"
+	C "github.com/whojave/clash/constant"
 )
 
 type Vmess struct {

build4android/build.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
 #
 # Build:
-#   - git clone -b dev https://github.com/whojave/clashr
-#   - cd clashr
+#   - git clone -b dev https://github.com/whojave/clash
+#   - cd clash
 #   - ANDROID_NDK=/path/to/android/ndk /path/to/this/script
 #
 
 export ANDROID_NDK=/home/king/Android/Sdk/ndk/20.0.5594570
 # export GOPATH=/usr/lib/go
 
-NAME=clashr
+NAME=clash
 BINDIR=bin
 VERSION=$(git describe --tags || echo "unknown version")
 BUILDTIME=$(LANG=C date -u)
@@ -24,8 +24,8 @@ export CXX=$ANDROID_CXX
 export CC=$ANDROID_CC 
 export LD=$ANDROID_LD 
 export CGO_ENABLED=1
-go build -ldflags "-X \"github.com/whojave/clashr/constant.Version=$VERSION\" -X \"github.com/whojave/clashr/constant.BuildTime=$BUILDTIME\" -w -s" \
-            -o "build4android/clashr_arm64"
+go build -ldflags "-X \"github.com/whojave/clash/constant.Version=$VERSION\" -X \"github.com/whojave/clash/constant.BuildTime=$BUILDTIME\" -w -s" \
+            -o "build4android/clash_arm64"
 
 
 ANDROID_CC=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang
@@ -37,8 +37,8 @@ export CXX=$ANDROID_CXX
 export CC=$ANDROID_CC 
 export LD=$ANDROID_LD 
 export CGO_ENABLED=1
-go build -ldflags "-X \"github.com/whojave/clashr/constant.Version=$VERSION\" -X \"github.com/whojave/clashr/constant.BuildTime=$BUILDTIME\" -w -s" \
-            -o "build4android/clashr_armv7a"
+go build -ldflags "-X \"github.com/whojave/clash/constant.Version=$VERSION\" -X \"github.com/whojave/clash/constant.BuildTime=$BUILDTIME\" -w -s" \
+            -o "build4android/clash_armv7a"
 
 
 ANDROID_CC=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android21-clang
@@ -50,8 +50,8 @@ export CC=$ANDROID_CC
 export LD=$ANDROID_LD 
 export CGO_ENABLED=1
 export GOARCH=386
-go build -ldflags "-X \"github.com/whojave/clashr/constant.Version=$VERSION\" -X \"github.com/whojave/clashr/constant.BuildTime=$BUILDTIME\" -w -s" \
-            -o "build4android/clashr_x86"
+go build -ldflags "-X \"github.com/whojave/clash/constant.Version=$VERSION\" -X \"github.com/whojave/clash/constant.BuildTime=$BUILDTIME\" -w -s" \
+            -o "build4android/clash_x86"
 
 
 ANDROID_CC=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang
@@ -63,8 +63,8 @@ export CC=$ANDROID_CC
 export LD=$ANDROID_LD 
 export CGO_ENABLED=1
 export GOARCH=amd64
-go build -ldflags "-X \"github.com/whojave/clashr/constant.Version=$VERSION\" -X \"github.com/whojave/clashr/constant.BuildTime=$BUILDTIME\" -w -s" \
-            -o "build4android/clashr_amd64"
+go build -ldflags "-X \"github.com/whojave/clash/constant.Version=$VERSION\" -X \"github.com/whojave/clash/constant.BuildTime=$BUILDTIME\" -w -s" \
+            -o "build4android/clash_amd64"
 
 
 

component/fakeip/pool.go

@@ -5,7 +5,7 @@ import (
 	"net"
 	"sync"
 
-	"github.com/whojave/clashr/common/cache"
+	"github.com/whojave/clash/common/cache"
 )
 
 // Pool is a implementation about fake ip generator without storage

component/simple-obfs/http.go

@@ -9,7 +9,7 @@ import (
 	"net"
 	"net/http"
 
-	"github.com/whojave/clashr/common/pool"
+	"github.com/whojave/clash/common/pool"
 )
 
 // HTTPObfs is shadowsocks http simple-obfs implementation

component/simple-obfs/tls.go

@@ -8,7 +8,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/whojave/clashr/common/pool"
+	"github.com/whojave/clash/common/pool"
 )
 
 func init() {

component/socks5/socks5.go

@@ -7,7 +7,7 @@ import (
 	"net"
 	"strconv"
 
-	"github.com/whojave/clashr/component/auth"
+	"github.com/whojave/clash/component/auth"
 )
 
 // Error represents a SOCKS error

component/v2ray-plugin/websocket.go

@@ -5,7 +5,7 @@ import (
 	"net"
 	"net/http"
 
-	"github.com/whojave/clashr/component/vmess"
+	"github.com/whojave/clash/component/vmess"
 )
 
 // Option is options of websocket obfs

component/vmess/aead.go

@@ -6,7 +6,7 @@ import (
 	"errors"
 	"io"
 
-	"github.com/whojave/clashr/common/pool"
+	"github.com/whojave/clash/common/pool"
 )
 
 type aeadWriter struct {

component/vmess/chunk.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"io"
 
-	"github.com/whojave/clashr/common/pool"
+	"github.com/whojave/clash/common/pool"
 )
 
 const (