diff options
| -rw-r--r-- | include/init.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/init.sh b/include/init.sh index 60dd3dd9..807174a8 100644 --- a/include/init.sh +++ b/include/init.sh @@ -31,8 +31,8 @@ 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 set_pyver set_version set_env git_init create_tmpdir \ - lock create_pathdirs child_exec; do + for init_cmd in set_pyver set_version set_env lock git_init \ + create_tmpdir create_pathdirs child_exec; do xbmk_$init_cmd "$@" || break done } @@ -159,6 +159,12 @@ xbmk_set_env() xbmktmp="$TMPDIR" } +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 @@ -187,12 +193,6 @@ xbmk_create_tmpdir() remkdir "$xbmktmp" "$xbmklocal" } -xbmk_lock() -{ - [ -f "$xbmklock" ] && err "'$xbmklock' exists. Is a build running?" - touch "$xbmklock" || err "cannot create '$xbmklock'"; : -} - xbmk_create_pathdirs() { remkdir "$XBMK_CACHE/gnupath" "$XBMK_CACHE/xbmkpath" |