From 5fa0f739795d048d71df943e6de693550aa2b009 Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>
Date: Thu, 1 May 2014 15:06:44 +0300
Subject: [PATCH] bashrc & zshrc: add / after directories in ls on OS X.

---
 bashrc |  4 ++--
 chmod  | 14 +++++++++-----
 zshrc  |  4 ++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/bashrc b/bashrc
index 35f42bce..a2e40896 100644
--- a/bashrc
+++ b/bashrc
@@ -116,8 +116,8 @@ if [[ $UNAME != Darwin ]]; then
 fi
 
 if [[ $UNAME = Darwin ]]; then
-    alias ll="ls -alFH"
-    alias l="ls -CF"
+    alias ll="ls -alFHGp"
+    alias l="ls -CFGp"
 fi
 
 # Add an "alert" alias for long running commands.  Use like so:
diff --git a/chmod b/chmod
index d4f317f1..80c05b28 100755
--- a/chmod
+++ b/chmod
@@ -9,6 +9,8 @@ GROUP=`id -gn`
 
 wwwdata=`head -n1 wwwuser`
 
+setfacl=`locate setfacl|grep bin|head -n1`
+
 echo "Denying Reading, Writing and eXecuting from other users in"
 echo "your home directory $HOME ."
 echo ""
@@ -44,16 +46,18 @@ echo ""
 chmod a+r-wx,u+rw ~/.face
 chmod a+r-wx,u+rw ~/.forward
 
-echo "Setting access lists. This requires package acl to be installed"
-echo "and kernel support for it and mount point being mounted with option"
-echo "acl"
-echo ""
+if [[ -f $setfacl ]]; then
+    echo "Setting access lists. This requires package acl to be installed"
+    echo "and kernel support for it and mount point being mounted with option"
+    echo "acl"
+    echo ""
 
 setfacl -R -m u:$wwwdata:rwx ~/public_html 
 setfacl -R -m d:u:$wwwdata:rwx ~/public_html 
+fi
 
 if [ -f chmod.2 ]; then
     ./chmod.2
-    fi
+fi
 
 echo "Everything is now done :)"
diff --git a/zshrc b/zshrc
index e298eea2..1dee0ad6 100644
--- a/zshrc
+++ b/zshrc
@@ -310,8 +310,8 @@ if [[ "$UNAME" != "Darwin" ]]; then
 fi
 
 if [[ $UNAME = Darwin ]]; then
-    alias ll="ls -alFH"
-    alias l="ls -CF"
+    alias ll="ls -alFHGp"
+    alias l="ls -CFGp"
 fi
 
 # Add an "alert" alias for long running commands.  Use like so: