1 files changed, 29 insertions, 7 deletions
diff --git a/scripts/utils b/scripts/utils
index c096f29..0034d9b 100644
--- a/scripts/utils
+++ b/scripts/utils
@@ -1,15 +1,35 @@
 # vim: ft=sh
 
-# Simple echo wrapper for stage marking
+## Simple echo wrappers #########################################################
 echo_stage() {
-	echo -e "\033[1;34m========== $@ ==========\033[0m"
+	echo -e "\033[1;34m========== $@ ==========\033[0m" >&2
 }
-
-# Simple echo wrapper for stage marking
 echo_info() {
-	echo -e "\033[1;32m---------- $@ ----------\033[0m"
+	echo -e "\033[1;32m---------- $@ ----------\033[0m" >&2
+}
+echo_fail() {
+	echo -e "\033[1;31m---------- $@ ----------\033[0m" >&2
+	return 1
+}
+
+## Cleanup handler ##############################################################
+_LAMINAR_LOCKS=""
+_handle_exit() {
+	# Free all locks
+	for LOCK in $_LAMINAR_LOCKS; do
+		laminarc unlock "$(basename "$0")-$LOCK"
+	done
+}
+trap _handle_exit EXIT
+
+# Verify that we are running in process that was configured with trap (not in
+# subprocess)
+_check_trap() {
+	[ -n "$(trap -p EXIT)" ] || \
+		echo_fail "Unable to use this function as trap handling is not available in subprocess"
 }
 
+#################################################################################
 # Fetch bare git repository to WORKSPACE
 # First argument has to be a source URL
 # Second argument is name of directory to which will be repository cloned to.
@@ -36,13 +56,15 @@ git_fetch() {
 # Lock special lock for this job
 # Extension appended to lock name has to be provided as first argument
 laminar_self_lock() {
-	# TODO trap release
+	_check_trap
+	_LAMINAR_LOCKS="$_LAMINAR_LOCKS $1"
 	laminarc lock "$(basename "$0")-$1"
 }
 
 # Unlock special lock for this job
 # Extension appended to lock name has to be provided as first argument
 laminar_self_unlock() {
-	# TODO remove trap release
+	_check_trap
 	laminarc unlock "$(basename "$0")-$1"
+	_LAMINAR_LOCKS="$(echo "$_LAMINAR_LOCKS" | sed "s/ $1//")"
 }