From: Jannik Zander <59698@grundfos.com>
Date: Thu, 12 Jul 2018 08:18:22 +0000 (+0200)
Subject: Minor update
X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=1a2ed6ab6e1705ed65f89589ef0b7a566b6cb467;p=dotfiles.git

Minor update
---

diff --git a/.bashrc b/.bashrc
index ac45a72..3d46d39 100644
--- a/.bashrc
+++ b/.bashrc
@@ -20,7 +20,7 @@ shopt -s no_empty_cmd_completion
 shopt -s nocaseglob
 
 # Set prompt
-PS1='\[\033]0;${USER}@${HOSTNAME}:${PWD}\007\]' # terminal title
+PS1='\[\033]0;${USERNAME}@${HOSTNAME}:${PWD}\007\]' # terminal title
 
 if [[ -z "$MSYS2_PS1" ]]; then
   PS1="$PS1"'${debian_chroot:+($debian_chroot)}'  # debian
@@ -52,7 +52,7 @@ HISTTIMEFORMAT="[%F %T] "
 HISTFILE=~/.bash_history.local
 PROMPT_COMMAND="history -a; $PROMPT_COMMAND"
 
-# Load completion, aliases, and local
+# Load completion, aliases, and local settings
 [ -f ~/.bash_completion ] && . ~/.bash_completion;
 [ -f ~/.bash_aliases ] && . ~/.bash_aliases;
 [ -f ~/.bashrc.local ] && . ~/.bashrc.local
diff --git a/.profile b/.profile
index ad576d0..9144e3b 100644
--- a/.profile
+++ b/.profile
@@ -1,9 +1,9 @@
 # .profile is for things not specifically related to Bash, like environment variables PATH and others, and should be available anytime.
 
-# set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/bin" ] ; then
-    PATH="$HOME/bin:$PATH"
-fi
+# set PATH so it includes user's private bin
+export PATH=~/bin:$PATH
+export TMP=~/.cache
+export TEMP=$TMP
 
 # Set default programs
 export SHELL='bash'
@@ -27,8 +27,6 @@ if [ -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs ]; then
   . ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs
   export XDG_DESKTOP_DIR XDG_DOWNLOAD_DIR XDG_TEMPLATES_DIR XDG_PUBLICSHARE_DIR XDG_DOCUMENTS_DIR XDG_MUSIC_DIR XDG_PICTURES_DIR XDG_VIDEOS_DIR
 fi
-export TMP=~/.cache
-export TEMP=$TMP
 
 # Enable syntax-highlighting in less.
 if [[ -f /mingw64/bin/src-hilite-lesspipe.sh ]]; then
@@ -41,6 +39,7 @@ export LESS=" -R "
 # colored GCC warnings and errors
 export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
 
+# call shell specific settings
 if [ ! "x${BASH_VERSION}" = "x" ]; then
-  [ -f "${HOME}/.bashrc" ] && . "${HOME}/.bashrc"
+  [ -f ~/.bashrc ] && . ~/.bashrc
 fi