Fixing command execution on Linux

Author: Explv

osbot_manager/src/bot_parameters/account/OSBotAccount.java

@@ -12,8 +12,8 @@ public OSBotAccount(final String username, final String password) {
     }
 
     @Override
-    public final String toParameterString() {
-        return String.format("-login \"%s:%s\"", getUsername(), getPassword());
+    public final String[] toParameter() {
+        return new String[]{ "-login", String.format("%s:%s", getUsername(), getPassword()) };
     }
 
     @Override

osbot_manager/src/bot_parameters/account/RunescapeAccount.java

@@ -61,8 +61,8 @@ private void readObject(ObjectInputStream stream) throws ClassNotFoundException,
     }
 
     @Override
-    public final String toParameterString() {
-        return String.format("-bot \"%s:%s:%d\"", getUsername(), getPassword(), pin.get());
+    public final String[] toParameter() {
+        return new String[] { "-bot", String.format("%s:%s:%d", getUsername(), getPassword(), pin.get()) };
     }
 
     @Override

osbot_manager/src/bot_parameters/bot/Bot.java

@@ -30,7 +30,7 @@ private void readObject(ObjectInputStream stream) throws ClassNotFoundException,
     }
 
     @Override
-    public String toParameterString() {
-        return "java -jar \"" + osbotPath + "\"";
+    public String[] toParameter() {
+        return new String[] { "java", "-jar", osbotPath };
     }
 }

osbot_manager/src/bot_parameters/configuration/Configuration.java

@@ -270,30 +270,32 @@ private void readObject(ObjectInputStream stream) throws ClassNotFoundException,
     }
 
     @Override
-    public final String toParameterString() {
-        String parameterString = runescapeAccount.get().toParameterString();
+    public final String[] toParameter() {
+
+        List<String> parameter = new ArrayList<>();
+
+        Collections.addAll(parameter, runescapeAccount.get().toParameter());
+
         if (proxy.get() != null) {
-            parameterString += " " + proxy.get().toParameterString();
+            Collections.addAll(parameter, proxy.get().toParameter());
         }
 
         if (memoryAllocation.get() != -1) {
-            parameterString += " -mem " + memoryAllocation.get();
+            Collections.addAll(parameter, "-mem", String.valueOf(memoryAllocation.get()));
         }
 
         if (collectData.get()) {
-            parameterString += " -data 1";
+            Collections.addAll(parameter, "-data", "1");
         }
 
         if (debugMode.get() && debugPort.get() != -1) {
-            parameterString += " -debug " + debugPort.get();
+            Collections.addAll(parameter, "-debug", String.valueOf(debugPort.get()));
         } else {
-            Optional<Integer> availablePort = getAvailablePort();
-            if (availablePort.isPresent()) {
-                parameterString += " -debug " + availablePort.get();
-            }
+            getAvailablePort().ifPresent(integer -> Collections.addAll(parameter, "-debug", String.valueOf(integer)));
         }
 
         List<String> allowParams = new ArrayList<>();
+
         if (lowResourceMode.get()) {
             allowParams.add("lowresource");
         }
@@ -314,7 +316,7 @@ public final String toParameterString() {
         }
 
         if (!allowParams.isEmpty()) {
-            parameterString += " -allow " + String.join(",", allowParams);
+            Collections.addAll(parameter, "-allow",  String.join(",", allowParams));
         }
 
         int worldVal;
@@ -325,10 +327,10 @@ public final String toParameterString() {
         }
 
         if (worldVal != -1) {
-            parameterString += " -world " + worldVal;
+            Collections.addAll(parameter, "-world", String.valueOf(worldVal));
         }
 
-        return parameterString;
+        return parameter.toArray(new String[parameter.size()]);
     }
 
     private Optional<Integer> getAvailablePort() {
@@ -451,10 +453,10 @@ public List<List<String>> getCommands(final Bot bot, final OSBotAccount osBotAcc
         for (final Script script : scripts.get()) {
             List<String> command = new ArrayList<>();
 
-            Collections.addAll(command, bot.toParameterString().split(" "));
-            Collections.addAll(command, osBotAccount.toParameterString().split(" "));
-            Collections.addAll(command, this.toParameterString().split(" "));
-            Collections.addAll(command, script.toParameterString().split(" "));
+            Collections.addAll(command, bot.toParameter());
+            Collections.addAll(command, osBotAccount.toParameter());
+            Collections.addAll(command, this.toParameter());
+            Collections.addAll(command, script.toParameter());
 
             commands.add(command);
         }

osbot_manager/src/bot_parameters/interfaces/BotParameter.java

@@ -1,5 +1,5 @@
 package bot_parameters.interfaces;
 
 public interface BotParameter {
-    String toParameterString();
+    String[] toParameter();
 }

osbot_manager/src/bot_parameters/proxy/Proxy.java

@@ -47,8 +47,8 @@ private void readObject(ObjectInputStream stream) throws ClassNotFoundException,
     }
 
     @Override
-    public String toParameterString() {
-        return String.format("-proxy %s:%d", ipAddress.get(), port.get());
+    public String[] toParameter() {
+        return new String[] { "-proxy", String.format("%s:%d", ipAddress.get(), port.get()) };
     }
 
     @Override

osbot_manager/src/bot_parameters/proxy/SecuredProxy.java

@@ -50,8 +50,8 @@ private void readObject(ObjectInputStream stream) throws ClassNotFoundException,
     }
 
     @Override
-    public final String toParameterString() {
-        return String.format("-proxy %s:%d:%s:%s", getIpAddress(), getPort(), username, password);
+    public final String[] toParameter() {
+        return new String[] { "-proxy", String.format("%s:%d:%s:%s", getIpAddress(), getPort(), username, password) };
     }
 
     @Override

osbot_manager/src/bot_parameters/script/Script.java

@@ -46,9 +46,11 @@ public final void setParameters(final String parameters) {
     public void setIsLocal(final boolean isLocal) { this.isLocal.set(isLocal); }
 
     @Override
-    public final String toParameterString() {
-        if (isLocal.get()) return String.format("-script \"\\\"%s\\\":%s\"", scriptIdentifier.get(), parameters.get());
-        else return String.format("-script \"%s:%s\"", scriptIdentifier.get(), parameters.get());
+    public final String[] toParameter() {
+        if (isLocal.get()) {
+            return new String[] { "-script", String.format("\\\"%s\\\":%s", scriptIdentifier.get(), parameters.get()) };
+        }
+        return new String[] { "-script", String.format("%s:%s", scriptIdentifier.get(), parameters.get()) };
     }
 
     private void writeObject(ObjectOutputStream stream) throws IOException {

osbot_manager/src/main/ExplvOSBotManager.java

@@ -50,11 +50,11 @@ private void showUpdateDialog() {
         label.setFont(new Font("Arial", 20));
         grid.add(label, 0, 0);
 
-        Hyperlink threadLink = new Hyperlink("Click here to update");
-        threadLink.setFont(new Font("Arial", 15));
-        threadLink.setPadding(new Insets(0, 0, 0, 0));
-        threadLink.setOnAction(e -> getHostServices().showDocument("http://osbot.org/forum/topic/100554-explvs-osbot-manager/"));
-        grid.add(threadLink, 0, 1);
+        Hyperlink updateLink = new Hyperlink("Update");
+        updateLink.setFont(new Font("Arial", 15));
+        updateLink.setPadding(new Insets(0, 0, 0, 0));
+        updateLink.setOnAction(e -> getHostServices().showDocument("https://github.com/Explv/osbot_manager/releases"));
+        grid.add(updateLink, 0, 1);
 
         dialog.showAndWait();
     }

osbot_manager/src/main/Version.java

@@ -8,7 +8,7 @@
 
 public class Version {
 
-    private final static float currentVersion = 7.8f;
+    private final static float currentVersion = 7.9f;
 
     public static boolean isLatestVersion() {
         try {