change qDup prompt to avoid zsh substitution

Hyperfoil · Jul 10, 2024 · 2bb162a · 2bb162a
1 parent 4455751
commit 2bb162a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/java/io/hyperfoil/tools/qdup/shell/AbstractShell.java b/src/main/java/io/hyperfoil/tools/qdup/shell/AbstractShell.java
@@ -30,7 +30,7 @@
  */
 public abstract class AbstractShell {
 
-    public static final String PROMPT = "<_#%@_qdup_@%#_> "; // a string unlikely to appear in the output of any command
+    public static final String PROMPT = "<_#__qdup__#_> "; // a string unlikely to appear in the output of any command
     public static final int RECONNECT_RETRY_DELAY = 10_000;
     public static final int MAX_RECONNECT_ATTEMPTS = 10;
 
@@ -316,8 +316,12 @@ public String shSync(String command, Map<String, String> prompt,int seconds) {
                 acquired = true;
             }
         } catch (InterruptedException e) {
-            logger.error("Interrupted waiting for shSync " + command, e);
-            Thread.interrupted();
+            if(isReady()) {
+                logger.error("Interrupted waiting for shSync " + command, e);
+            }else{
+                //this is expected
+            }
+            Thread.currentThread().interrupt();
         } finally {
             removeShObserver(SH_BLOCK_CALLBACK);
         }