diff --git a/rtenets b/rtenets index 3269641..2028ea0 100755 --- a/rtenets +++ b/rtenets @@ -182,7 +182,7 @@ check_git_config() { # Initialize git repository init_repo() { check_git_config - \git init + info "$(\git init)" } # ----------------- Tree commands ----------------------- @@ -207,6 +207,8 @@ main "\$@" STUB chmod +x "${script_name}" fi + + info "wrote '${script_name}'" } # Fetch licence @@ -216,7 +218,8 @@ fetch_licence() { if ! [[ -f "${licence}" ]]; then if has_command curl; then info "setting licence to GPL by default, see https://www.gnu.org/licenses for more options" - \curl "https://www.gnu.org/licenses/gpl-3.0.txt" > "${licence}" + \curl -s "https://www.gnu.org/licenses/gpl-3.0.txt" > "${licence}" + info "wrote '${licence}'" else warning "please choose a free software licence, see https://www.gnu.org/licenses" fi @@ -228,8 +231,8 @@ create_readme() { local readme="README.md~" if ! [[ -f "${readme}" ]]; then - local project_name="$(enter "project name: ")" - local project_desc="$(enter "project short description: ")" + local project_name="$(cond_enter "project name: " PROJECT_NAME)" + local project_desc="$(cond_enter "project short description: " PROJECT_DESC)" cat << READMEMSG > "${readme}" # ${project_name} @@ -267,6 +270,7 @@ create_authors_file() { if ! [[ -f AUTHORS ]]; then printf "%s\\n" "${USER} <${EMAIL}> ${AFFILIATION}" > AUTHORS fi + info "wrote 'AUTHORS'" } # Create required files @@ -333,7 +337,7 @@ setup_dalembert_gitea() { local remote_ssh="$(jq '.ssh_url' <<< "${repo_json}")" local remote_http="$(jq '.clone_url' <<< "${repo_json}")" - if [[ "$(\git remote | \grep -c '^dalembert$')" == "0" ]]; then + if [[ "$(\git remote | \grep -c '^dalembert$' || true)" == "0" ]]; then \git remote add dalembert "${remote_ssh}" info "created remote dalembert with '${remote_ssh}" else @@ -350,14 +354,19 @@ init-tree() { declare desc="usage: rtenets init-tree " local directory="$1" + ( + cd "${directory}" + init_repo + create_tenet_file_tree + ) } init-gitea() { - true + declare desc="usage: rtenets init-gitea " } init-workflow() { - true + declare desc="usage: rtenets init-workflow " } # Create git repository @@ -371,14 +380,13 @@ create() { cd "${repo_name}" init_repo create_tenet_file_tree - setup_dalembert_gitea ) } # Print usage and exit usage() { cat </dev/null) && main "$@" || true