From abf015fb065c7064f988b025d7f517014c582364 Mon Sep 17 00:00:00 2001 From: Kostis Anagnostopoulos <ankostis@gmail.com> Date: Tue, 24 May 2022 14:07:37 +0300 Subject: [PATCH] fix(setup) log to stderr --- setup-account.sh | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/setup-account.sh b/setup-account.sh index 2b60bca..3971000 100755 --- a/setup-account.sh +++ b/setup-account.sh @@ -62,8 +62,7 @@ function _mute { } function _log { - echo -n "${FUNCNAME[${lognstack:-1}]}: " - echo "${@}" + echo -n "${FUNCNAME[${lognstack:-1}]}: ${@}" > /dev/stderr } function _cmd_before_update { @@ -77,7 +76,7 @@ function _cmd_before_update { else _log -en "${running_msg:-updating...}" if [ -n "${dry_run}" ]; then - echo "${force:+(FORCE)}(DRY_RUN)" + echo "${force:+(FORCE)}(DRY_RUN)" > /dev/stderr return 1 # (already run) when $dry_run fi return 0 # true, to run if-body updating stuff. @@ -115,7 +114,7 @@ $include /etc/inputrc "\C-x\C-r": re-read-init-file EOF - echo "UPDATED" + echo "UPDATED" > /dev/stderr fi } @@ -128,7 +127,7 @@ function upd20_bashrc_git_completions { source /usr/share/bash-completion/completions/git EOF - echo "UPDATED" + echo "UPDATED" > /dev/stderr fi } @@ -157,7 +156,7 @@ HISTIGNORE=?:? shopt -u progcomp EOF - echo "UPDATED" + echo "UPDATED" > /dev/stderr fi } @@ -173,7 +172,7 @@ export UTRANS="/eos/jeodpp/home/users/${USER}/transfer" export PTRANS="/eos/jeodpp/data/projects/LEGENT/transfer" EOF - echo "UPDATED" + echo "UPDATED" > /dev/stderr fi } @@ -249,7 +248,7 @@ $_git_completion_cmd __git_wrap__git_cherry_remote remu $_git_completion_cmd __git_wrap__git_cherry_remote remr EOF - echo "UPDATED" + echo "UPDATED" > /dev/stderr fi } @@ -259,7 +258,7 @@ function upd30_git_user_name { read -e inp git config --global user.name "inp" - echo "UPDATED" + echo "UPDATED" > /dev/stderr fi } @@ -316,7 +315,7 @@ UTRANS="/eos/jeodpp/home/users/${USER}/transfer" PTRANS="/eos/jeodpp/data/projects/LEGENT/transfer" EOF - echo "UPDATED" + echo "UPDATED" > /dev/stderr fi } @@ -402,7 +401,7 @@ unset _UDS_OLD_PATH unset _UDS_OLD_PYTHONPATH EOF echo "UPDATED - RE-ACTIVATE YOUR ENVIRONMENT with: conda activate $conda_env_prefix_homed" + RE-ACTIVATE YOUR ENVIRONMENT with: conda activate $conda_env_prefix_homed" > /dev/stderr fi } @@ -445,10 +444,10 @@ else fi if [ "$nargs" -eq 0 ]; then - echo "Running all actions${dry_run:+(DRY_RUN)}${keep_going:+(KEEP_GOING)}${force:+(FORCE)}..." + echo "Running all actions${dry_run:+(DRY_RUN)}${keep_going:+(KEEP_GOING)}${force:+(FORCE)}..." > /dev/stderr all else - echo "Running x$nargs actions: '${@}'" + echo "Running x$nargs actions: '${@}'" > /dev/stderr ## execute the asked action. for cmd in "${@}"; do $cmd -- GitLab