From e8438a522a27a75e88cd8cad2a78283a2f227359 Mon Sep 17 00:00:00 2001 From: Wuxiang Date: Mon, 19 Mar 2018 16:40:47 +0800 Subject: [PATCH 1/3] fix typo fix typo --- app/proxyman/proxyman.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/proxyman/proxyman.go b/app/proxyman/proxyman.go index 1ae393aa..a8ec466b 100644 --- a/app/proxyman/proxyman.go +++ b/app/proxyman/proxyman.go @@ -1,4 +1,4 @@ -// Package proxyman defines applications for manageing inbound and outbound proxies. +// Package proxyman defines applications for managing inbound and outbound proxies. package proxyman //go:generate go run $GOPATH/src/v2ray.com/core/common/errors/errorgen/main.go -pkg proxyman -path App,Proxyman From 8ffedde5a95f711d429c9b6e632b9e682262dd48 Mon Sep 17 00:00:00 2001 From: mubiale Date: Mon, 19 Mar 2018 17:01:15 +0800 Subject: [PATCH 2/3] fix typos --- release/config/systemv/v2ray | 0 release/install-release.sh | 6 +++--- release/make-release.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 release/config/systemv/v2ray diff --git a/release/config/systemv/v2ray b/release/config/systemv/v2ray old mode 100644 new mode 100755 diff --git a/release/install-release.sh b/release/install-release.sh index 0c0c71f4..c6a7c82e 100755 --- a/release/install-release.sh +++ b/release/install-release.sh @@ -149,7 +149,7 @@ extract(){ mkdir -p /tmp/v2ray unzip $1 -d "/tmp/v2ray/" if [[ $? -ne 0 ]]; then - colorEcho ${RED} "Extracting V2Ray faile!" + colorEcho ${RED} "Extracting V2Ray failed!" exit fi return 0 @@ -371,11 +371,11 @@ main(){ NEW_VER=`ls /tmp/v2ray |grep v2ray-v |cut -d "-" -f2` fi else - # dowload via network and extract + # download via network and extract installSoftware "curl" getVersion if [[ $? == 0 ]] && [[ "$FORCE" != "1" ]]; then - colorEcho ${GREEN} "Lastest version ${NEW_VER} is already installed." + colorEcho ${GREEN} "Latest version ${NEW_VER} is already installed." exit else colorEcho ${BLUE} "Installing V2Ray ${NEW_VER} on ${ARCH}" diff --git a/release/make-release.sh b/release/make-release.sh index 387e1bdc..d2caa0ba 100755 --- a/release/make-release.sh +++ b/release/make-release.sh @@ -27,7 +27,7 @@ pushd $GOPATH/src/v2ray.com/core echo "Adding a new tag: " "v$VER" git tag -s -a "v$VER" -m "Version ${VER}" sed -i '' "s/\(version *= *\"\).*\(\"\)/\1$VERN\2/g" core.go -echo "Commiting core.go (may not necessary)" +echo "Committing core.go (may not necessary)" git commit core.go -S -m "Update version" echo "Pushing changes" git push --follow-tags From 10618b629b68f882675df8b21dae7f154e60eae2 Mon Sep 17 00:00:00 2001 From: mubiale Date: Mon, 19 Mar 2018 17:33:52 +0800 Subject: [PATCH 3/3] fix typo --- v2ray.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 v2ray.go diff --git a/v2ray.go b/v2ray.go old mode 100644 new mode 100755 index f2c782ba..d6884216 --- a/v2ray.go +++ b/v2ray.go @@ -130,7 +130,7 @@ func (s *Instance) Start() error { } // RegisterFeature registers the given feature into V2Ray. -// If feature is one of the following types, the corressponding feature in this Instance +// If feature is one of the following types, the corresponding feature in this Instance // will be replaced: DNSClient, PolicyManager, Router, Dispatcher, InboundHandlerManager, OutboundHandlerManager. func (s *Instance) RegisterFeature(feature interface{}, instance Feature) error { running := false