Skip to content

Commit

Permalink
module-loading (#17)
Browse files Browse the repository at this point in the history
* not anymore redundant source of ~/.bashrc & /etc/bashrc producing annoying complains (#13)

* now really sourcing the custom .vimrc (#15)

* module load git on cineca & menrva (#16)
  • Loading branch information
andreagalle authored May 11, 2020
1 parent 99e0375 commit 2ae02e8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 25 deletions.
15 changes: 4 additions & 11 deletions .bash_profile
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
# .bash_profile

# Get the aliases and functions
if [ -f ~/.bashrc ]; then
. ~/.bashrc
fi

# User specific environment and startup programs

PATH=$PATH:$HOME/.local/bin:$HOME/bin

export PATH

galledanza_dir=`dirname "${BASH_SOURCE[0]}"`

export galledanza_dir
Expand All @@ -20,6 +9,10 @@ if [ -d $galledanza_dir/bin ] ; then
PATH=$galledanza_dir/bin:"${PATH}"
fi

if [[ "$HPC_SYSTEM" =~ ^(marconi|galileo|m100)$ || "$HOSTNAME" =~ ^(menrva1)$ ]]; then
module load git
fi

export PATH

if [ -f $galledanza_dir/.config ]; then
Expand Down
10 changes: 1 addition & 9 deletions .bashrc
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
# .bashrc

# Source global definitions
if [ -f /etc/bashrc ]; then
. /etc/bashrc
fi

# Uncomment the following line if you don't like systemctl's auto-paging feature:
# export SYSTEMD_PAGER=

# User specific aliases and functions

alias l='ls -lrth --color'
Expand All @@ -30,7 +22,7 @@ alias vvv='tail -f *[^make].log'
alias mmm='simlog=$(ls | sort -V | tail -n 1); tail -f $simlog'
alias mmake='make -j8'

alias -- update-galledanza ='. update-galledanza'
alias -- update-galledanza='. update-galledanza'

alias came='ssh -C [email protected]'
alias cama='ssh -C [email protected]'
8 changes: 3 additions & 5 deletions install
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,9 @@ cat <<EOT >> ~/.vimrc
" added by galledanza `git describe --tags` installer
function! SomeCheck()
if filereadable("$galledanza_dir/.vimrc")
so "$galledanza_dir/.vimrc"
endif
endfunction
if filereadable("$galledanza_dir/.vimrc")
so $galledanza_dir/.vimrc
endif
EOT

Expand Down

0 comments on commit 2ae02e8

Please sign in to comment.