From 571932d33eb68139e787178f39cf88190c6f0d71 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Thu, 16 May 2024 11:23:22 +0100 Subject: [PATCH] build: remove excmd() and simplify main() Signed-off-by: Leah Rowe --- build | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/build b/build index 61057e8..787a11f 100755 --- a/build +++ b/build @@ -24,6 +24,7 @@ main() { x_ id -u 1>/dev/null 2>/dev/null [ $# -lt 1 ] && $err "Check $projectname documentation for help." + spath="script/$1" [ "$1" = "dependencies" ] && x_ install_packages $@ && xbmk_exit 0 @@ -34,9 +35,12 @@ main() git config --global user.email 1>/dev/null 2>/dev/null || \ git_err "git config --global user.email \"john.doe@example.com\"" - for cmd in initcmd git_init excmd; do - eval "${cmd} \$@" - done + initcmd $@ + git_init + + [ -f "${spath}" ] || $err "Bad command. Check $projectname docs." + shift 1; "$spath" $@ || $err "excmd: ${spath} ${@}" + xbmk_exit 0 } @@ -87,13 +91,6 @@ git_init() $err "${PWD}: cannot git-tag ${projectname}/${version}" } -excmd() -{ - spath="script/${1}" - [ -f "${spath}" ] || $err "Bad command. Check $projectname docs." - shift 1; "$spath" $@ || $err "excmd: ${spath} ${@}" -} - mkrelease() { export XBMK_RELEASE="y"