Commit 4e39705a authored by Max Lv's avatar Max Lv

refine the commands

parent 232ac78e
...@@ -327,8 +327,6 @@ class Shadowsocks ...@@ -327,8 +327,6 @@ class Shadowsocks
ab.append("kill -9 `cat /data/data/com.github.shadowsocks/ss-local.pid`") ab.append("kill -9 `cat /data/data/com.github.shadowsocks/ss-local.pid`")
ab.append("kill -9 `cat /data/data/com.github.shadowsocks/ss-tunnel.pid`") ab.append("kill -9 `cat /data/data/com.github.shadowsocks/ss-tunnel.pid`")
ab.append("kill -9 `cat /data/data/com.github.shadowsocks/tun2socks.pid`") ab.append("kill -9 `cat /data/data/com.github.shadowsocks/tun2socks.pid`")
ab.append("killall -9 pdnsd")
ab.append("killall -9 tun2socks")
ab.append("rm /data/data/com.github.shadowsocks/pdnsd.conf") ab.append("rm /data/data/com.github.shadowsocks/pdnsd.conf")
ab.append("rm /data/data/com.github.shadowsocks/pdnsd.cache") ab.append("rm /data/data/com.github.shadowsocks/pdnsd.cache")
...@@ -336,7 +334,6 @@ class Shadowsocks ...@@ -336,7 +334,6 @@ class Shadowsocks
ab.clear() ab.clear()
ab.append("kill -9 `cat /data/data/com.github.shadowsocks/redsocks.pid`") ab.append("kill -9 `cat /data/data/com.github.shadowsocks/redsocks.pid`")
ab.append("killall -9 redsocks")
ab.append("rm /data/data/com.github.shadowsocks/redsocks.conf") ab.append("rm /data/data/com.github.shadowsocks/redsocks.conf")
ab.append(Utils.getIptables + " -t nat -F OUTPUT") ab.append(Utils.getIptables + " -t nat -F OUTPUT")
......
...@@ -151,7 +151,7 @@ class ShadowsocksNatService extends Service with BaseService { ...@@ -151,7 +151,7 @@ class ShadowsocksNatService extends Service with BaseService {
} }
val cmd = if (Build.VERSION.SDK_INT >= 20) { val cmd = if (Build.VERSION.SDK_INT >= 20) {
"system/bin/" + args "/system/bin/" + args
} else { } else {
Path.BASE + args Path.BASE + args
} }
...@@ -185,7 +185,7 @@ class ShadowsocksNatService extends Service with BaseService { ...@@ -185,7 +185,7 @@ class ShadowsocksNatService extends Service with BaseService {
p.println(conf) p.println(conf)
}) })
val cmd = if (Build.VERSION.SDK_INT >= 20) { val cmd = if (Build.VERSION.SDK_INT >= 20) {
"system/bin/" + args "/system/bin/" + args
} else { } else {
Path.BASE + args Path.BASE + args
} }
...@@ -315,16 +315,14 @@ class ShadowsocksNatService extends Service with BaseService { ...@@ -315,16 +315,14 @@ class ShadowsocksNatService extends Service with BaseService {
val ab = new ArrayBuffer[String] val ab = new ArrayBuffer[String]
ab.append("kill -9 `cat " + Path.BASE + "ss-tunnel.pid`") ab.append("kill -9 `cat " + Path.BASE + "ss-tunnel.pid`")
ab.append("kill -9 `cat " + Path.BASE +"redsocks.pid`") ab.append("kill -9 `cat " + Path.BASE +"redsocks.pid`")
ab.append("killall -9 redsocks") ab.append("killall -9 redsocks")
ab.append("kill -15 `cat " + Path.BASE + "pdnsd.pid`") ab.append("kill -15 `cat " + Path.BASE + "pdnsd.pid`")
ab.append("killall -15 pdnsd") ab.append("killall -15 pdnsd")
Console.runRootCommand(ab.toArray) Console.runRootCommand(ab.toArray)
ab.clear()
ab.clear()
ab.append("kill -9 `cat " + Path.BASE + "ss-local.pid`") ab.append("kill -9 `cat " + Path.BASE + "ss-local.pid`")
Console.runCommand(ab.toArray) Console.runCommand(ab.toArray)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment