Determine (but don't export) some uname results: SYSTEM (uname -s), KERNEL (uname...

git-svn-id: https://svn.cambridge.iain.cx/profile/trunk@89 6be0d1a5-5cfe-0310-89b6-964be062b18b

diff --git a/.profile.d/OS.bashrc b/.profile.d/OS.bashrc
new file mode 100644 (file)
index 0000000..84f0338
--- /dev/null
+++ b/.profile.d/OS.bashrc
@@ -0,0 +1,4 @@
+# $Id$
+SYSTEM=$(uname -s)
+KERNEL=$(uname -r)
+ARCHITECTURE=$(uname -m)

diff --git a/.profile.d/variables.bashrc b/.profile.d/variables.bashrc
index a794cef..037e943 100644 (file)
--- a/.profile.d/variables.bashrc
+++ b/.profile.d/variables.bashrc
@@ -5,9 +5,13 @@ export SSHTERM_EXEC=-e
 #export TERM=xterm-xfree86
 export TERM=linux
 export LC_CTYPE=en_GB
-export LS_OPTIONS="--color=auto -F -b --time-style=long-iso"
+if ls --help 2>/dev/null | grep -qs gnu.org; then
+  export LS_OPTIONS="--color=auto -F -b"
+elif [ "$SYSTEM" = "Darwin" ]; then
+  export LS_OPTIONS="-G -F -b"
+fi
 export VISUAL=vim
-eval `dircolors` 2>/dev/null
+eval `dircolors 2>/dev/null` 2>/dev/null
 unset XMODIFIERS #:-(
 export SSHTERM="urxvt"
 export SSHTERM_TITLE="-title"