diff options
| -rw-r--r-- | include/init.sh | 18 | ||||
| -rwxr-xr-x | mk | 15 |
2 files changed, 17 insertions, 16 deletions
diff --git a/include/init.sh b/include/init.sh index 973eee6f..b7f79936 100644 --- a/include/init.sh +++ b/include/init.sh @@ -57,8 +57,8 @@ xbmk_init() eval "[ ! -f \".$fv\" ] || read -r $fv < \".$fv\" || :" done - for init_cmd in set_pyver set_env set_version create_tmpdir lock \ - create_pathdirs child_exec; do + for init_cmd in set_pyver set_env set_version git_init create_tmpdir \ + lock create_pathdirs child_exec; do xbmk_$init_cmd "$@" || break done } @@ -185,6 +185,20 @@ xbmk_set_version() export LOCALVERSION="-$projectname-${version%%-*}" } +xbmk_git_init() +{ + [ -L ".git" ] && return 1 + [ -e ".git" ] && return 0 + eval "`setvars "$(date -Rud @$versiondate)" cdate _nogit`" + + x_ git init 1>/dev/null 2>/dev/null + x_ git add -A . 1>/dev/null 2>/dev/null + x_ git commit -m "$projectname $version" --date "$cdate" \ + --author="xbmk <xbmk@example.com>" 1>/dev/null 2>/dev/null + x_ git tag -a "$version" -m "$projectname $version" 1>/dev/null \ + 2>/dev/null; : +} + xbmk_create_tmpdir() { # unify all temporary files/directories in a single TMPDIR @@ -24,7 +24,7 @@ main() cmd="" && [ $# -gt 0 ] && cmd="$1" && shift 1 for g in "command -v git" "git config --global user.name" \ - "git config --global user.email" "git_init"; do + "git config --global user.email"; do eval "$g 1>/dev/null 2>/dev/null || $err \"Unconfigured: $g\"" done @@ -37,19 +37,6 @@ main() set -u -e # some commands disable them. turn them on! } -git_init() -{ - [ -L ".git" ] && return 1 - [ -e ".git" ] && return 0 - eval "`setvars "$(date -Rud @$versiondate)" cdate _nogit`" - - git init || return 1 - git add -A . || return 1 - git commit -m "$projectname $version" --date "$cdate" \ - --author="xbmk <xbmk@example.com>" || return 1 - git tag -a "$version" -m "$projectname $version" || return 1 -} - release() { export XBMK_RELEASE="y" |