From 07a4324a28d6fd46262f465b7bdd8b1f43688c7f Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Wed, 14 Jun 2017 18:02:27 +0300
Subject: [PATCH] =?UTF-8?q?Zond:=20=D0=BD=D0=B5=D1=81=D0=BA=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BA=D0=BE=20=D1=84=D0=B8=D0=BA=D1=81=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zond/build.gradle                      |  2 +-
 zond/src/main/java/asys/zond/Main.java | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/zond/build.gradle b/zond/build.gradle
index 6c3b453..64b24b6 100644
--- a/zond/build.gradle
+++ b/zond/build.gradle
@@ -1,5 +1,5 @@
 group = 'asys'
-version = '0.6.12-SNAPSHOT'
+version = '0.6.13-SNAPSHOT'
 
 apply plugin: 'application'
 
diff --git a/zond/src/main/java/asys/zond/Main.java b/zond/src/main/java/asys/zond/Main.java
index 182632f..b6db385 100644
--- a/zond/src/main/java/asys/zond/Main.java
+++ b/zond/src/main/java/asys/zond/Main.java
@@ -56,7 +56,7 @@ public class Main {
         PipeInputStream pipeInputStream = new PipeInputStream();
         Shell.getInstance().start(System.in, commandLine -> {
             if (commandLine.equalsIgnoreCase(":exit")) {
-                Shell.getInstance().getOutput().println("force exit");
+                log("force exit");
                 watchdog.destroyProcess();
                 Shell.getInstance().shutdown();
                 Main.shutdown();
@@ -64,17 +64,11 @@ public class Main {
             }
             pipeInputStream.write(commandLine+"\r\n");
         });
-
         Connector.getInstance().startReconnect();
-
-        int resultCode = executeProcess(args, Shell.getInstance().getOutput(), pipeInputStream);
-
-        System.out.println(Ansi.ansi().reset().newline()
-            .fg(Color.GREEN).a("Process Finished. Code: ")
-            .bold().fg(Color.WHITE).a(resultCode).reset());
+        executeProcess(args, Shell.getInstance().getOutput(), pipeInputStream);
     }
 
-    private static int executeProcess(String[] args, PrintStream printStream, InputStream stdin) throws IOException {
+    private static void executeProcess(String[] args, PrintStream printStream, InputStream stdin) throws IOException {
         String cmdLine = Arrays.stream(args).collect(Collectors.joining(" "));
         CommandLine commandLine = CommandLine.parse(cmdLine);
         DefaultExecutor executor = new DefaultExecutor();
@@ -94,7 +88,8 @@ public class Main {
             resultCode = -1;
         }
 
-        return resultCode;
+        watchdog = null;
+        log("Process finished. Code: " + resultCode);
     }
 
     private static void loadConfig() throws IOException {