zsh/zdharma-continuum.zconvey
1
0
Fork 0
mirror of https://github.com/zdharma-continuum/zconvey.git synced 2026-09-10 07:06:21 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

*.plugin.zsh: Further fix zsystem / flock usage (activated Zsh >= 5.3)

Browse source
This commit is contained in:
Sebastian Gniazdowski 2017-03-01 11:33:53 +01:00
parent e039c0e252
commit 3e7fe023d8
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
zconvey.plugin.zsh
View file

@ -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