diff options
| -rw-r--r-- | include/init.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/include/init.sh b/include/init.sh index 35512469..ee19c398 100644 --- a/include/init.sh +++ b/include/init.sh @@ -30,8 +30,7 @@ xbmk_init() id -u 1>/dev/null 2>/dev/null || err "suid check failed (id -u)" [ "$(id -u)" != "0" ] || err "this command as root is not permitted" - for init_cmd in get_version set_env lock git_init child_exec - do + for init_cmd in get_version set_env git_init child_exec; do xbmk_$init_cmd "$@" || break done } @@ -82,6 +81,9 @@ xbmk_set_env() return 1 fi + [ -f "$xbmklock" ] && err "'$xbmklock' exists. Is a build running?" + touch "$xbmklock" || err "cannot create '$xbmklock'"; : + # parent instance of xbmk, so don't return. set up TMPDIR export TMPDIR="/tmp" export TMPDIR="$(mktemp -d -t xbmk_XXXXXXXX)" @@ -189,12 +191,6 @@ pybin() command -v "$1" 2>/dev/null || return 1 } -xbmk_lock() -{ - [ -f "$xbmklock" ] && err "'$xbmklock' exists. Is a build running?" - touch "$xbmklock" || err "cannot create '$xbmklock'"; : -} - xbmk_git_init() { for gitarg in "--global user.name" "--global user.email"; do |