From 502058108542a250f46a79c6064863ae7086fc2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Tue, 28 Aug 2018 12:44:41 +0200 Subject: Fix laminarc lock release --- scripts/utils | 8 ++++---- templates/turris4x.run | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/utils b/scripts/utils index 0034d9b..0414868 100644 --- a/scripts/utils +++ b/scripts/utils @@ -15,9 +15,9 @@ echo_fail() { ## Cleanup handler ############################################################## _LAMINAR_LOCKS="" _handle_exit() { - # Free all locks + # Release all locks for LOCK in $_LAMINAR_LOCKS; do - laminarc unlock "$(basename "$0")-$LOCK" + laminarc release "$(basename "$0")-$LOCK" done } trap _handle_exit EXIT @@ -63,8 +63,8 @@ laminar_self_lock() { # Unlock special lock for this job # Extension appended to lock name has to be provided as first argument -laminar_self_unlock() { +laminar_self_release() { _check_trap - laminarc unlock "$(basename "$0")-$1" + laminarc release "$(basename "$0")-$1" _LAMINAR_LOCKS="$(echo "$_LAMINAR_LOCKS" | sed "s/ $1//")" } diff --git a/templates/turris4x.run b/templates/turris4x.run index 49fb34b..a7b3c5c 100755 --- a/templates/turris4x.run +++ b/templates/turris4x.run @@ -43,7 +43,7 @@ else cd openwrt fi -laminar_self_unlock sdk +laminar_self_release sdk echo_stage "Add our repository as feed" echo "src-git personal file://$WORKSPACE/pkgs" >> feeds.conf -- cgit v1.2.3