@mafredri's flock solution

rupa/z#199
agkozak · Dec 13, 2018 · 30bded5 · 30bded5
1 parent 4f1dfba
commit 30bded5
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/zsh-z.plugin.zsh b/zsh-z.plugin.zsh
@@ -336,15 +336,21 @@ zshz() {
       esac
     done
 
+    # zsystem flock-based solution by @mafredri
+
     # A temporary file that gets copied over the datafile if all goes well
     local tempfile="$(mktemp "${datafile}.XXXXXXXX")"
 
-    # Make sure tht the datafile exists for locking
-    [[ -f $datafile ]] || touch "$datafile"
-    local lockfd
+    if (( $ZSHZ_USE_ZSYSTEM_FLOCK )); then
+
+      # Make sure tht the datafile exists for locking
+      [[ -f $datafile ]] || touch "$datafile"
+      local lockfd
 
-    # Grab exclusive lock (released when function exits)
-    zsystem flock -f lockfd "$datafile" || return
+      # Grab exclusive lock (released when function exits)
+      zsystem flock -f lockfd "$datafile" || return
+
+    fi
 
     _zshz_maintain_datafile "$*" >| "$tempfile"