diff --git a/.bash_profile b/.bash_profile index fed7a50..d3fab6b 100644 --- a/.bash_profile +++ b/.bash_profile @@ -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 @@ -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 diff --git a/.bashrc b/.bashrc index 016f33f..b4669d7 100644 --- a/.bashrc +++ b/.bashrc @@ -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' @@ -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 gallegati@menrva1.dima.uniroma1.it' alias cama='ssh -C agallega@login.marconi.cineca.it' diff --git a/install b/install index a47fde0..2d3c244 100755 --- a/install +++ b/install @@ -58,11 +58,9 @@ cat <> ~/.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