改变kcptun缺省路径

ywb94 · ywb94 · commit 378ccbf3e88d · 2016-12-30T22:06:12.000+08:00
diff --git a/files/luci/i18n/shadowsocksr.zh-cn.lmo b/files/luci/i18n/shadowsocksr.zh-cn.lmo
diff --git a/files/luci/i18n/shadowsocksr.zh-cn.po b/files/luci/i18n/shadowsocksr.zh-cn.po
@@ -133,8 +133,8 @@ msgstr "&#26381;&#21153;&#31471;&#37197;&#32622;"
 msgid "KcpTun Enable"
 msgstr "KcpTun &#21551;&#29992;"
 
-msgid "bin:/usr/bin/kcptun/ssr-kcptun"
-msgstr "&#20108;&#36827;&#21046;&#25991;&#20214;&#65306;/usr/bin/kcptun/ssr-kcptun"
+msgid "bin:/usr/bin/ssr-kcptun"
+msgstr "&#20108;&#36827;&#21046;&#25991;&#20214;&#65306;/usr/bin/ssr-kcptun"
 
 msgid "KcpTun Port"
 msgstr "KcpTun &#31471;&#21475;"
@@ -146,7 +146,7 @@ msgid "KcpTun Password"
 msgstr "KcpTun &#23494;&#30721;"
 
 msgid "Haven't a Kcptun executable file"
-msgstr "&#19981;&#23384;&#22312;Kcptun&#21487;&#25191;&#34892;&#25991;&#20214;&#65292;&#35831;&#19979;&#36733;Kcptun&#21487;&#25191;&#34892;&#25991;&#20214;&#24182;&#25918;&#20837;/usr/bin/kcptun/ssr-kcptun"
+msgstr "&#19981;&#23384;&#22312;Kcptun&#21487;&#25191;&#34892;&#25991;&#20214;&#65292;&#35831;&#19979;&#36733;Kcptun&#21487;&#25191;&#34892;&#25991;&#20214;&#24182;&#25913;&#21517;&#25918;&#20837;/usr/bin/ssr-kcptun"
 
 msgid "Not a Kcptun executable file"
 msgstr "Kcptun&#21487;&#25191;&#34892;&#25991;&#20214;&#26684;&#24335;&#19981;&#27491;&#30830;&#65292;&#35831;&#30830;&#35748;&#26159;&#21542;&#27491;&#30830;&#19979;&#36733;&#20102;&#36335;&#30001;&#22120;&#23545;&#24212;&#30340;&#21487;&#25191;&#34892;&#25991;&#20214;"
diff --git a/files/luci/model/cbi/shadowsocksr/client.lua b/files/luci/model/cbi/shadowsocksr/client.lua
@@ -145,15 +145,15 @@ o.rmempty = false
 
 o = s:option(Value, "obfs_param", translate("obfs_param(optional)"))
 
-kcp_enable = s:option(Flag, "kcp_enable", translate("KcpTun Enable"), translate("bin:/usr/bin/kcptun/ssr-kcptun"))
+kcp_enable = s:option(Flag, "kcp_enable", translate("KcpTun Enable"), translate("bin:/usr/bin/ssr-kcptun"))
 kcp_enable.rmempty = false
 
 
 o = s:option(Value, "kcp_port", translate("KcpTun Port"))
 o.datatype = "port"
 o.default = 4000
 function o.validate(self, value, section)
-		local kcp_file="/usr/bin/kcptun/ssr-kcptun"
+		local kcp_file="/usr/bin/ssr-kcptun"
 		local enable = kcp_enable:formvalue(section) or kcp_enable.disabled
 		if enable == kcp_enable.enabled then
     if not fs.access(kcp_file)  then
diff --git a/files/shadowsocksr.init b/files/shadowsocksr.init
@@ -86,16 +86,16 @@ start_rules() {
 #deal kcp
 	local kcp_enable=$(uci_get_by_name $GLOBAL_SERVER kcp_enable)
 	if [ $kcp_enable = "1" ] ;then
-		[ ! -f "/usr/bin/kcptun/ssr-kcptun" ]  &&  return 1
-		chmod 755 /usr/bin/kcptun/ssr-kcptun
-		local kcp_str=`/usr/bin/kcptun/ssr-kcptun -v |grep kcptun|wc -l`
+		[ ! -f "/usr/bin/ssr-kcptun" ]  &&  return 1
+		
+		local kcp_str=`/usr/bin/ssr-kcptun -v |grep kcptun|wc -l`
 		[ "0" = $kcp_str ] && return 1
     local kcp_port=$(uci_get_by_name $GLOBAL_SERVER kcp_port)
     local server_port=$(uci_get_by_name $GLOBAL_SERVER server_port)
     local password=$(uci_get_by_name $GLOBAL_SERVER kcp_password)
     local kcp_param=$(uci_get_by_name $GLOBAL_SERVER kcp_param)
     [ "$password" != "" ] && password="--key "${password}
-    service_start /usr/bin/kcptun/ssr-kcptun -r $server:$kcp_port -l :$server_port  $password $kcp_param 
+    service_start /usr/bin/ssr-kcptun -r $server:$kcp_port -l :$server_port  $password $kcp_param 
     kcp_enable_flag=1
 	fi
 	
diff --git a/files/shadowsocksr.monitor b/files/shadowsocksr.monitor
@@ -87,7 +87,7 @@ do
       then
       killall -q -9 ssr-kcptun
 
-			( /usr/bin/kcptun/ssr-kcptun -r $server:$kcp_port -l :$server_port  $password $kcp_param &)
+			( /usr/bin/ssr-kcptun -r $server:$kcp_port -l :$server_port  $password $kcp_param &)
       fi   
       fi
 

-Original file line number
+Diff line change
 msgid "KcpTun Enable"
 msgstr "KcpTun 启用"
 -msgid "bin:/usr/bin/kcptun/ssr-kcptun"
 -msgstr "二进制文件：/usr/bin/kcptun/ssr-kcptun"
 +msgid "bin:/usr/bin/ssr-kcptun"
 +msgstr "二进制文件：/usr/bin/ssr-kcptun"
 msgid "KcpTun Port"
 msgstr "KcpTun 端口"
 msgstr "KcpTun 密码"
 msgid "Haven't a Kcptun executable file"
 -msgstr "不存在Kcptun可执行文件，请下载Kcptun可执行文件并放入/usr/bin/kcptun/ssr-kcptun"
 +msgstr "不存在Kcptun可执行文件，请下载Kcptun可执行文件并改名放入/usr/bin/ssr-kcptun"
 msgid "Not a Kcptun executable file"
 msgstr "Kcptun可执行文件格式不正确，请确认是否正确下载了路由器对应的可执行文件"