Merge branch 'master' into dataport

.bash_extra

@@ -1,14 +1,13 @@
 #!/bin/bash
 
 # source extra files
-# https://stackoverflow.com/questions/6659689/referring-to-a-file-relative-to-executing-script
-source "${BASH_SOURCE%/*}/.bash_aliases"
-source "${BASH_SOURCE%/*}/.bash_functions"
-source "${BASH_SOURCE%/*}/.bash_ps1"
+source "/home/mg/dotfiles/.bash_aliases"
+source "/home/mg/dotfiles/.bash_functions"
+source "/home/mg/dotfiles/.bash_ps1"
 
 ### PATH
 # add my scripts to PATH
-PATH=$PATH:"${BASH_SOURCE%/*}/scripts"
+PATH=$PATH:"/home/mg/dotfiles/scripts"
 
 ## check interactive shell https://unix.stackexchange.com/questions/26676/how-to-check-if-a-shell-is-login-interactive-batch
 if [[ $- == *i* ]] ; then