tools: use cmp and right arguments for mount

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

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/app/src/main/java/com/wireguard/android/SettingsActivity.java b/app/src/main/java/com/wireguard/android/SettingsActivity.java
index bc6d71f2..70912a48 100644
--- a/app/src/main/java/com/wireguard/android/SettingsActivity.java
+++ b/app/src/main/java/com/wireguard/android/SettingsActivity.java
@@ -64,12 +64,12 @@ public class SettingsActivity extends Activity {
                 final String arg1 = "'" + libDir + "/" + libraryNamedExecutable[0] + "'";
                 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("trap 'mount -o remount,ro /system' EXIT;");
-            cmd.append("mount -o remount,rw /system;");
+            cmd.append("trap 'mount -o ro,remount /system' EXIT;");
+            cmd.append("mount -o rw,remount /system;");
 
             for (final String[] libraryNamedExecutable : libraryNamedExecutables) {
                 final String arg1 = "'" + libDir + "/" + libraryNamedExecutable[0] + "'";