split changerouteto command

icymind · icymind · commit bc770fb81161 · 2017-08-14T23:28:23.000+08:00
diff --git a/js/vrouter-local.js b/js/vrouter-local.js
@@ -149,8 +149,8 @@ class VRouter {
     }
     const cmd1 = `/sbin/route change default ${ip}`
     const cmd2 = `/usr/sbin/networksetup -setdnsservers "${info[0]}" "${ip}"`
-    // https://askubuntu.com/questions/634620/when-using-and-sudo-on-the-first-command-is-the-second-command-run-as-sudo-t
-    return this.sudoExec(`/bin/bash -c '${cmd1} && ${cmd2}'`)
+    await this.sudoExec(cmd1)
+    await this.sudoExec(cmd2)
   }
   async getActiveAdapter () {
     let cmd = String.raw`cat <<EOF | scutil

Original file line number	Diff line number	Diff line change
`@@ -149,8 +149,8 @@ class VRouter {`
`149`	`149`	`}`
`150`	`150`	const cmd1 = `/sbin/route change default ${ip}`
`151`	`151`	const cmd2 = `/usr/sbin/networksetup -setdnsservers "${info[0]}" "${ip}"`
`152`		`- // https://askubuntu.com/questions/634620/when-using-and-sudo-on-the-first-command-is-the-second-command-run-as-sudo-t`
`153`		- return this.sudoExec(`/bin/bash -c '${cmd1} && ${cmd2}'`)
	`152`	`+ await this.sudoExec(cmd1)`
	`153`	`+ await this.sudoExec(cmd2)`
`154`	`154`	`}`
`155`	`155`	`async getActiveAdapter () {`
`156`	`156`	let cmd = String.raw`cat <<EOF \| scutil