From 3e7fe023d8d608657931bdbd2b0c777084de0de0 Mon Sep 17 00:00:00 2001
From: Sebastian Gniazdowski <sgniazdowski@gmail.com>
Date: Wed, 1 Mar 2017 11:33:53 +0100
Subject: [PATCH] *.plugin.zsh: Further fix zsystem / flock usage (activated
 Zsh >= 5.3)

---
 zconvey.plugin.zsh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/zconvey.plugin.zsh b/zconvey.plugin.zsh
index b76bc33..3bdb087 100644
--- a/zconvey.plugin.zsh
+++ b/zconvey.plugin.zsh
@@ -238,12 +238,12 @@ fi
         [[ "$try_id" = "0" ]] && continue
 
         lockfile="${ZCONVEY_LOCKS_DIR}/zsh_nr${try_id}"
-        echo "Lock done by Zsh (PID $$)" > "$lockfile"
+        [[ ! -f "$lockfile" ]] && echo "(created)" > "$lockfile"
 
         # Use zsystem only if non-blocking call is available (Zsh >= 5.3)
         # -e: preserve file descriptor on exec
         if [ "${ZCONVEY_CONFIG[use_zsystem_flock]}" = "1" ]; then
-            zsystem flock -t 0 -f ZCONVEY_FD -e "$lockfile"
+            zsystem 2>/dev/null flock -t 0 -f ZCONVEY_FD -e "$lockfile"
             res="$?"
         else
             exec {ZCONVEY_FD}>"$lockfile"
@@ -284,8 +284,10 @@ fi
         fi
     done
 
-    # Output PID to the locked file
-    [[ "$ZCONVEY_FD" -ne "0" ]] && echo "$$" >&${ZCONVEY_FD}
+    # Output PID to the locked file. The problem is
+    # with Zsh 5.3, 5.3.1 - zsystem's obtained file
+    # descriptors cannot be written to
+    [[ "$ZCONVEY_FD" -ne "0" ]] && { echo "$$" >&${ZCONVEY_FD} } 2>/dev/null
 
     # Show what is resolved (ID and possibly a NAME)
     [ "$ZCONVEY_CONFIG[greeting]" = "logo" ] && zc-logo echo