From 99dc012725d58a37d28a11d12a322226af198918 Mon Sep 17 00:00:00 2001 From: Kostis Anagnostopoulos <ankostis@gmail.com> Date: Tue, 17 May 2022 00:19:13 +0300 Subject: [PATCH] refact(setup) reflect actual actions order > put conda_init last, the lat one to execute on the 1st run. --- setup-account.sh | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/setup-account.sh b/setup-account.sh index 3137a98..dd8aaae 100755 --- a/setup-account.sh +++ b/setup-account.sh @@ -175,6 +175,24 @@ function upd20_git_aliases { fi } +function upd20_ipython_ustore_vars { + if [ -f "$ipython_startup_ustore_vars" ]; then + _log "already ok" + else + _log -n "updating..." + mkdir -p $(dirname "$ipython_startup_ustore_vars") + cat > "$ipython_startup_ustore_vars" <<- EOF +## BDAP Storage locations +PSTORE="/eos/jeodpp/data/projects/LEGENT" +USTORE="/eos/jeodpp/home/users/${USER}" +UTRANS="/eos/jeodpp/home/users/${USER}/transfer" +PTRANS="/eos/jeodpp/data/projects/LEGENT/transfer" + +EOF + echo "UPDATED" + fi +} + function upd40_bashrc_conda_init { if _mute grep ">>> conda initialize >>>" ~/.bashrc; then _log 'already ok; delete ">>> conda initialize >>>" section from `~/.bashrc` to re-run.' @@ -199,24 +217,6 @@ function upd40_bashrc_conda_init { fi } -function upd20_ipython_ustore_vars { - if [ -f "$ipython_startup_ustore_vars" ]; then - _log "already ok" - else - _log -n "updating..." - mkdir -p $(dirname "$ipython_startup_ustore_vars") - cat > "$ipython_startup_ustore_vars" <<- EOF -## BDAP Storage locations -PSTORE="/eos/jeodpp/data/projects/LEGENT" -USTORE="/eos/jeodpp/home/users/${USER}" -UTRANS="/eos/jeodpp/home/users/${USER}/transfer" -PTRANS="/eos/jeodpp/data/projects/LEGENT/transfer" - -EOF - echo "UPDATED" - fi -} - ## This function must be the 1st to run after all `upd_xxx` actions. # The last command of this action, activating conda-env, # will fail if not re-logged in after `conda init bash`. -- GitLab