Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools: use cmp and right arguments for mount

Browse Source 
Some systems don't have cmp.
Some systems have buggy mount tools.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2017-12-20 17:54:28 +01:00
parent 8937cf82fb
commit 53752eb21e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/wireguard/android/SettingsActivity.java
View File

@ -64,12 +64,12 @@ public class SettingsActivity extends Activity {
final String arg1 = "'" + libDir + "/" + libraryNamedExecutable[0] + "'"; final String arg1 = "'" + libDir + "/" + libraryNamedExecutable[0] + "'";
final String arg2 = "'/system/xbin/" + libraryNamedExecutable[1] + "'"; final String arg2 = "'/system/xbin/" + libraryNamedExecutable[1] + "'";
cmd.append(String.format("diff %s %s && ", arg1, arg2)); cmd.append(String.format("cmp -s %s %s && ", arg1, arg2));
} }
cmd.append("exit 114;"); cmd.append("exit 114;");
cmd.append("trap 'mount -o remount,ro /system' EXIT;"); cmd.append("trap 'mount -o ro,remount /system' EXIT;");
cmd.append("mount -o remount,rw /system;"); cmd.append("mount -o rw,remount /system;");
for (final String[] libraryNamedExecutable : libraryNamedExecutables) { for (final String[] libraryNamedExecutable : libraryNamedExecutables) {
final String arg1 = "'" + libDir + "/" + libraryNamedExecutable[0] + "'"; final String arg1 = "'" + libDir + "/" + libraryNamedExecutable[0] + "'";