From 9e99343b436ed4eef46058db5a8b0e5d4f472ca8 Mon Sep 17 00:00:00 2001
From: RPRX <63339210+rprx@users.noreply.github.com>
Date: Sat, 15 Aug 2020 02:40:30 +0000
Subject: [PATCH 1/4] ERROR: This script has been deprecated

---
 release/install-release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/install-release.sh b/release/install-release.sh
index ba2ab100..ebd3d610 100755
--- a/release/install-release.sh
+++ b/release/install-release.sh
@@ -16,5 +16,5 @@ colorEcho(){
     echo -e "\033[${1}${@:2}\033[0m" 1>& 2
 }
 
-colorEcho ${RED} "WARN: This script will be obsolete soon, please switch to the fhs-install-v2ray project in time."
+colorEcho ${RED} "ERROR: This script has been deprecated, please switch to the fhs-install-v2ray project."
 colorEcho ${YELLOW} "URL: https://github.com/v2fly/fhs-install-v2ray"

From 353f927ddf462daef1973034b86093d8797fb4d6 Mon Sep 17 00:00:00 2001
From: DuckSoft <realducksoft@gmail.com>
Date: Sat, 15 Aug 2020 16:04:57 +0800
Subject: [PATCH 2/4] goodbye go.sh

---
 release/install-release.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/release/install-release.sh b/release/install-release.sh
index ebd3d610..5a9cec8f 100755
--- a/release/install-release.sh
+++ b/release/install-release.sh
@@ -16,5 +16,6 @@ colorEcho(){
     echo -e "\033[${1}${@:2}\033[0m" 1>& 2
 }
 
-colorEcho ${RED} "ERROR: This script has been deprecated, please switch to the fhs-install-v2ray project."
+colorEcho ${RED} "ERROR: This script has been DISCARDED, please switch to fhs-install-v2ray project."
 colorEcho ${YELLOW} "URL: https://github.com/v2fly/fhs-install-v2ray"
+exit 255

From 1ab9e58dce7d2d234bf7988abf14f6b8ff052bd4 Mon Sep 17 00:00:00 2001
From: Vigilans <vigilans@foxmail.com>
Date: Sat, 15 Aug 2020 21:28:34 +0800
Subject: [PATCH 3/4] Supply test for domain matcher group

---
 common/strmatcher/strmatcher_test.go | 94 ++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 common/strmatcher/strmatcher_test.go

diff --git a/common/strmatcher/strmatcher_test.go b/common/strmatcher/strmatcher_test.go
new file mode 100644
index 00000000..f9cf2e73
--- /dev/null
+++ b/common/strmatcher/strmatcher_test.go
@@ -0,0 +1,94 @@
+package strmatcher_test
+
+import (
+	"reflect"
+	"testing"
+
+	"v2ray.com/core/common"
+	. "v2ray.com/core/common/strmatcher"
+)
+
+// See https://github.com/v2fly/v2ray-core/issues/92#issuecomment-673238489
+func TestMatcherGroup(t *testing.T) {
+	rules := []struct {
+		Type   Type
+		Domain string
+	}{
+		{
+			Type:   Regex,
+			Domain: "apis\\.us$",
+		},
+		{
+			Type:   Substr,
+			Domain: "apis",
+		},
+		{
+			Type:   Domain,
+			Domain: "googleapis.com",
+		},
+		{
+			Type:   Domain,
+			Domain: "com",
+		},
+		{
+			Type:   Full,
+			Domain: "www.baidu.com",
+		},
+		{
+			Type:   Substr,
+			Domain: "apis",
+		},
+		{
+			Type:   Domain,
+			Domain: "googleapis.com",
+		},
+		{
+			Type:   Full,
+			Domain: "fonts.googleapis.com",
+		},
+		{
+			Type:   Full,
+			Domain: "www.baidu.com",
+		},
+		{
+			Type:   Domain,
+			Domain: "example.com",
+		},
+	}
+	cases := []struct {
+		Input  string
+		Output []uint32
+	}{
+		{
+			Input:  "www.baidu.com",
+			Output: []uint32{5, 9, 4},
+		},
+		{
+			Input:  "fonts.googleapis.com",
+			Output: []uint32{8, 3, 7, 4, 2, 6},
+		},
+		{
+			Input:  "example.googleapis.com",
+			Output: []uint32{3, 7, 4, 2, 6},
+		},
+		{
+			Input:  "testapis.us",
+			Output: []uint32{1, 2, 6},
+		},
+		{
+			Input:  "example.com",
+			Output: []uint32{10, 4},
+		},
+	}
+	matcherGroup := &MatcherGroup{}
+	for _, rule := range rules {
+		matcher, err := rule.Type.New(rule.Domain)
+		common.Must(err)
+		matcherGroup.Add(matcher)
+	}
+	for _, test := range cases {
+		if m := matcherGroup.Match(test.Input); !reflect.DeepEqual(m, test.Output) {
+			t.Error("unexpected output: ", m, " for test case ", test)
+		}
+	}
+}

From e0bbf474ae806eeef8bd8e07912ebd5134ef0986 Mon Sep 17 00:00:00 2001
From: RPRX <63339210+rprx@users.noreply.github.com>
Date: Sat, 15 Aug 2020 13:55:07 +0000
Subject: [PATCH 4/4] Add more guide

---
 release/install-release.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/release/install-release.sh b/release/install-release.sh
index 5a9cec8f..61c7ee5d 100755
--- a/release/install-release.sh
+++ b/release/install-release.sh
@@ -17,5 +17,6 @@ colorEcho(){
 }
 
 colorEcho ${RED} "ERROR: This script has been DISCARDED, please switch to fhs-install-v2ray project."
-colorEcho ${YELLOW} "URL: https://github.com/v2fly/fhs-install-v2ray"
+colorEcho ${YELLOW} "HOW TO USE: https://github.com/v2fly/fhs-install-v2ray"
+colorEcho ${YELLOW} "TO MIGRATE: https://github.com/v2fly/fhs-install-v2ray/wiki/Migrate-from-the-old-script-to-this"
 exit 255