diff options
| -rw-r--r-- | include/init.sh | 6 | ||||
| -rwxr-xr-x | mk | 18 |
2 files changed, 9 insertions, 15 deletions
diff --git a/include/init.sh b/include/init.sh index 6a5bd2fc..a88bd13f 100644 --- a/include/init.sh +++ b/include/init.sh @@ -198,8 +198,10 @@ xbmk_git_init() x_ git tag -a "$version" -m "$projectname $version" 1>/dev/null \ 2>/dev/null - x_ git config --global user.name - x_ git config --global user.email + for gitarg in "--global user.name" "--global user.email"; do + gitcmd="git config $gitarg"; $gitcmd || $err \ + "Please run this first: $gitcmd \"your ${gitcmd##*.}\"" + done } xbmk_create_tmpdir() @@ -21,21 +21,13 @@ eval "`setvars "" vdir src_dirname srcdir mode`" main() { - cmd="" - if [ $# -gt 0 ]; then - cmd="$1" - shift 1 - fi + cmd="" && [ $# -gt 0 ] && cmd="$1" && shift 1 case "$cmd" in - version) - printf "%s\nWebsite: %s\n" "$relname" "$projectsite" ;; - release|download|inject) - $cmd "$@" ;; - -*) - return 1 ;; - *) - $err "bad command" ;; + version) printf "%s\nWebsite: %s\n" "$relname" "$projectsite" ;; + release|download|inject) $cmd "$@" ;; + -*) return 1 ;; + *) $err "bad command" ;; esac set -u -e # some commands disable them. turn them on! } |