diff --git a/.gitignore b/.gitignore index eb34036f..7809f0c0 100755 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -# It seems that running install.sh causes ~ files in this git repo. They are lockfiles. *~ *.swp pgprules.xml diff --git a/bashrc b/bashrc index 6f78c80a..693f9176 100755 --- a/bashrc +++ b/bashrc @@ -6,6 +6,9 @@ # Aliases RJ706I # Functions ZGC5QQ +# $uname should tell which OS is used. +$uname=`uname` + # For Mac OS X + SSH sessions. bashrc must be sourced by hand at least once. echo "if [ -f ~/.bashrc ]; then source ~/.bashrc @@ -136,12 +139,6 @@ hostname && uptime # Source before mentioned locations if they exist. -# Don't check for mail! -unset MAILCHECK - -# Enable core files. -ulimit -c unlimited - # .environment if [ -f ~/.environment ]; then source ~/.environment @@ -152,6 +149,13 @@ if [ -f ~/.bash_environment ]; then source ~/.bash_environment fi +# Don't check for mail! +unset MAILCHECK + +# Enable core files. +ulimit -c unlimited + + # More colours :D if [[ $TERM == 'xterm' ]]; then export TERM=xterm-256color diff --git a/recommends b/recommends index 67a40c40..a920c1f2 100755 --- a/recommends +++ b/recommends @@ -1,13 +1,18 @@ +uname=`uname` + command -v \youtube-dl >/dev/null 2>&1 || { echo >&2 "shell-things contains youtube-dl alias for automatically setting video title as name, so you might want to install youtube-dl."; } -command -v \gtk-redshift >/dev/null 2>&1 || { echo >&2 "xsessionrc tries to start gtk-redshift automatically on boot, so you might want to install it (or redshift in some distributions)."; } +if [ $uname = "linux" ] +then + command -v \gtk-redshift >/dev/null 2>&1 || { echo >&2 "xsessionrc tries to start gtk-redshift automatically on boot, so you might want to install it (or redshift in some distributions)."; } +fi if [ ! -f /usr/share/doc/gnupg-curl/copyright ] then - echo "You might want to install gnupg-curl. It allows you to use shortened URLs with gpg1." + echo "You might want to install gnupg-curl. It allows you to use shortened URLs with gpg1." && echo "If you aren't on Linux, you can ignore this." fi if [ ! -f /usr/share/doc/popularity-contest/copyright ] then - echo "You might want to install popularity-contest. See http://popcon.debian.org/" + echo "You might want to install popularity-contest. See http://popcon.debian.org/" && echo "If you aren't on Linux you can ignore this." fi diff --git a/vimrc b/vimrc index e1e69a4f..a8088850 100644 --- a/vimrc +++ b/vimrc @@ -81,9 +81,6 @@ runtime macros/matchit.vim set wildmenu set wildmode=list:longest -" Set terminal title (This probably helps with tmux) -set title - " Flash, do not beep! set visualbell " End of copied from http://items.sjbach.com/319/configuring-vim-right @@ -92,3 +89,10 @@ set visualbell if has('gui_running') set background=light endif + +if has("unix") + let s:uname = system("uname") + if s:uname == "Darwin\n" + set background=light + endif +endif diff --git a/zshrc b/zshrc index 63aca325..e95a7d13 100755 --- a/zshrc +++ b/zshrc @@ -6,6 +6,9 @@ # Aliases RJ706I # Functions ZGC5QQ +# uname should be readable in $uname +uname=`uname` + ##### Defaults etc... M0TZLS ##### # This is based on zshrc which came with Debian (Third option in wizard for new users.) @@ -58,12 +61,6 @@ hostname && uptime # Source before mentioned locations if they exist. -# Don't check for mail! -unset MAILCHECK - -# Enable core files -ulimit -c unlimited - # .environment if [ -f ~/.environment ]; then source ~/.environment @@ -79,6 +76,13 @@ if [ -f ~/.zshenv ]; then source ~/.zshenv fi +# Don't check for mail! +unset MAILCHECK + +# Enable core files. +ulimit -c unlimited + + #More colours :D if [[ $TERM == 'xterm' ]]; then export TERM=xterm-256color