Merge branch 'master' of ssh-git.ncltech.co.uk:Phil/dotfiles

.bash_aliases

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-## DOWNLOADED FROM GITLAB
+## DOWNLOADED FROM GIT REPO
 
 # My Alias
 
@@ -219,68 +219,4 @@ extract() {
    esac
  }
 
-## Terminal Settings
-## set a fancy prompt (non-color, unless we know we "want" color)
-#case "$TERM" in
-#    xterm-color) color_prompt=yes;;
-#esac
-#
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-force_color_prompt=yes
-#
-#if [ -n "$force_color_prompt" ]; then
-#    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-	# We have color support; assume it's compliant with Ecma-48
-	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-	# a case would tend to support setf rather than setaf.)
-#	color_prompt=yes
-#    else
-#	color_prompt=
-#    fi
-#fi
 
-#if [ "$color_prompt" = yes ]; then
-#    PS1="\[\033[0;31m\]\342\224\214\342\224\200\$([[ \$? != 0 ]] && echo \"[\[\033[0;31m\]\342\234\227\[\033[0;37m\]]\342\224\200\")[$(if [[ ${EUID} == 0 ]]; then echo '\[\033[01;31m\]root\[\033[01;33m\]@\[\033[01;96m\]\h'; else echo '\[\033[0;39m\]\u\[\033[01;33m\]@\[\033[01;96m\]\h'; fi)\[\033[0;31m\]]\342\224\200[\[\033[0;32m\]\w\[\033[0;31m\]]\n\[\033[0;31m\]\342\224\224\342\224\200\342\224\200\342\225\274 \[\033[0m\]\[\e[01;33m\]\\$\[\e[0m\]"
-#else
-#    PS1='┌──[\u@\h]─[\w]\n└──╼ \卌\n'
-#fi
-#
-# Set 'man' colors
-#if [ "$color_prompt" = yes ]; then
-#	man() {
-#	env \
-#	LESS_TERMCAP_mb=$'\e[01;31m' \
-#	LESS_TERMCAP_md=$'\e[01;31m' \
-#	LESS_TERMCAP_me=$'\e[0m' \
-#	LESS_TERMCAP_se=$'\e[0m' \
-#	LESS_TERMCAP_so=$'\e[01;44;33m' \
-#	LESS_TERMCAP_ue=$'\e[0m' \
-#	LESS_TERMCAP_us=$'\e[01;32m' \
-#	man "$@"
-#	}
-#fi
-
-#unset color_prompt force_color_prompt
-
-# If this is an xterm set the title to user@host:dir
-#case "$TERM" in
-#xterm*|rxvt*)
-#    PS1="\[\033[0;31m\]\342\224\214\342\224\200\$([[ \$? != 0 ]] && echo \"[\[\033[0;31m\]\342\234\227\[\033[0;37m\]]\342\224\200\")[$(if [[ ${EUID} == 0 ]]; then echo '\[\033[01;31m\]root\[\033[01;33m\]@\[\033[01;96m\]\h'; else echo '\[\033[0;39m\]\u\[\033[01;33m\]@\[\033[01;96m\]\h'; fi)\[\033[0;31m\]]\342\224\200[\[\033[0;32m\]\w\[\033[0;31m\]]\n\[\033[0;31m\]\342\224\224\342\224\200\342\224\200\342\225\274 \[\033[0m\]\[\e[01;33m\]\\$\[\e[0m\]"
-#    ;;
-#*)
-#    ;;
-#esac
-
-# enable color support of ls and also add handy aliases
-#if [ -x /usr/bin/dircolors ]; then
-#    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-#    alias ls='ls --color=auto'
-#    alias dir='dir --color=auto'
-#    alias vdir='vdir --color=auto'
-#
-#    alias grep='grep --color=auto'
-#    alias fgrep='fgrep --color=auto'
-#    alias egrep='egrep --color=auto'
-#fi

.bash_exports

@@ -1,5 +1,5 @@
 
-## DOWNLOADED FROM GITHUB ##
+## DOWNLOADED FROM GIT REPO ##
 
 export EDITOR=/usr/bin/vim
 

.bashrc

@@ -1,5 +1,5 @@
 
-## DOWNLOADED FROM GITHUB ##
+## DOWNLOADED FROM GIT REPO ##
 
 # ~/.bashrc: executed by bash(1) for non-login shells.
 # see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)

.profile

@@ -1,3 +1,5 @@
+##DOWNLOADED FROM GIT REPO##
+
 # ~/.profile: executed by the command interpreter for login shells.
 # This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
 # exists.

.tmux.conf

@@ -1,5 +1,5 @@
 
-## DOWNLOADED FROM GITHUB ##
+## DOWNLOADED FROM GIT REPO ##
 
 # Send prefix
 set-option -g prefix C-b

.vimrc

@@ -1,3 +1,4 @@
+##DOWNLOADED FROM GIT REPO##
 syntax on
 set tabstop=4
 filetype on

README.md

@@ -25,5 +25,5 @@ cd ~/dotfiles
 ```
 ./uninstall.sh
 
-### Test Edit
+
 ```

install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-## DOWNLOADED FROM GITHUB ##
+## DOWNLOADED FROM GIT REPO ##
 
 # Find all dot files then if the original file exists, create a backup
 # Once backed up to {file}.dtbak symlink the new dotfile in place

uninstall.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-## DOWNLOADED FROM GITHUB ##
+## DOWNLOADED FROM GIT REPO ##
 
 # Loop through all the dotfiles, if the file is a symlink then remove it
 # Then if the backup file exists, restore it to it's original location