From 50162678eb467b16970a3bdeed0a477f08c4025c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sat, 1 Sep 2018 12:16:01 +0200 Subject: Split utils to common and utils It is beneficial to use utils also in other processes but there were parts that should only job it self include. This splits those to two separate files. --- scripts/utils | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'scripts/utils') diff --git a/scripts/utils b/scripts/utils index a955699..8781882 100644 --- a/scripts/utils +++ b/scripts/utils @@ -1,6 +1,7 @@ # vim: ft=sh +[ -n "$LAMINAR_COMMON" ] # variables definition guard -if [ "$V" -ge 2 ]; then +if [ "$V" -ge 3 ]; then set -x fi @@ -19,21 +20,6 @@ echo_fail() { return 1 } -## Job and template IDs ######################################################### -# Returns current job's id -jobid() { - basename "$0" | sed 's/\.run$//' -} - -# Return current template's id -# If this is not template then this returns job's id -templateid() { - basename "$(readlink -f "$0")" | sed 's/\.run$//' -} - -TWORKSPACE="$HOME/workspace/$(templateid)" -[ "$(jobid)" != "$(templateid)" ] || TWORKSPACE="$HOME/workspace/notemplate" - ## GIT ########################################################################## # Fetch bare git repository # First argument has to be a source URL -- cgit v1.2.3