From 73292820e1eea039f79df3f905524b9fb546d2bf Mon Sep 17 00:00:00 2001 From: Reto Haeberli Date: Sun, 6 Sep 2015 17:59:53 +0200 Subject: [PATCH 1/4] Improved ls aliases from http://tldp.org/LDP/abs/html/sample-bashrc.html --- aliases/available/general.aliases.bash | 36 +++++++++++++++++++------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash index bc884050..e980247a 100644 --- a/aliases/available/general.aliases.bash +++ b/aliases/available/general.aliases.bash @@ -2,19 +2,35 @@ cite about-alias about-alias 'general aliases' # List directory contents -alias sl=ls -alias ls='ls -G' # Compact view, show colors -alias la='ls -AF' # Compact view, show hidden -alias ll='ls -al' -alias l='ls -a' -alias l1='ls -1' +# Source: http://tldp.org/LDP/abs/html/sample-bashrc.html + +# # Add colors for filetype and human-readable sizes by default on 'ls': +#alias ls='ls --color' +alias l='ls -a --color' # Standard +alias lx='ls -lXB --color' # Sort by extension. +alias lk='ls -lSr --color' # Sort by size, biggest last. +alias lt='ls -ltr --color' # Sort by date, most recent last. +alias lc='ls -ltcr --color' # Sort by/show change time,most recent last. +alias lu='ls -ltur --color' # Sort by/show access time,most recent last. + +# # The ubiquitous 'll': directories first, with alphanumeric sorting: +alias ll="ls -lv --group-directories-first --color" + alias lm='ll |more' # Pipe through 'more' + alias lr='ll -R' # Recursive ls. + alias la='ll -A' # Show hidden files. +alias tree='tree -C' # Nice alternative to 'recursive ls' ... + +alias sl='ls' +alias l1='ls -1 --group-directories-first --color' + +# alias ls='ls -G' # Compact view, show colors +# alias la='ls -AF' # Compact view, show hidden +# alias ll='ls -al' + alias _="sudo" -if [ $(uname) = "Linux" ] -then - alias ls="ls --color=auto" -fi + which gshuf &> /dev/null if [ $? -eq 0 ] then From 2bcc572e8de14fa367ba70b33b8f3f0a6a05b277 Mon Sep 17 00:00:00 2001 From: Reto Haeberli Date: Sun, 6 Sep 2015 19:57:08 +0200 Subject: [PATCH 2/4] ls alias cleanup --- aliases/available/general.aliases.bash | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash index e980247a..03155058 100644 --- a/aliases/available/general.aliases.bash +++ b/aliases/available/general.aliases.bash @@ -5,7 +5,6 @@ about-alias 'general aliases' # Source: http://tldp.org/LDP/abs/html/sample-bashrc.html # # Add colors for filetype and human-readable sizes by default on 'ls': -#alias ls='ls --color' alias l='ls -a --color' # Standard alias lx='ls -lXB --color' # Sort by extension. alias lk='ls -lSr --color' # Sort by size, biggest last. @@ -15,18 +14,15 @@ alias lu='ls -ltur --color' # Sort by/show access time,most recent last. # # The ubiquitous 'll': directories first, with alphanumeric sorting: alias ll="ls -lv --group-directories-first --color" - alias lm='ll |more' # Pipe through 'more' - alias lr='ll -R' # Recursive ls. - alias la='ll -A' # Show hidden files. +alias lm='ll |more' # Pipe through 'more' +alias lr='ll -R' # Recursive ls. +alias la='ll -A' # Show hidden files. + alias tree='tree -C' # Nice alternative to 'recursive ls' ... alias sl='ls' alias l1='ls -1 --group-directories-first --color' -# alias ls='ls -G' # Compact view, show colors -# alias la='ls -AF' # Compact view, show hidden -# alias ll='ls -al' - alias _="sudo" From b8393252dbf97b432c083139617ccad42e411193 Mon Sep 17 00:00:00 2001 From: Reto Haeberli Date: Tue, 8 Sep 2015 19:40:07 +0200 Subject: [PATCH 3/4] ls alias differentiation Linux, OS X, OS X with coreutils ls --- aliases/available/general.aliases.bash | 54 +++++++++++++++++++------- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash index 03155058..1fec85b0 100644 --- a/aliases/available/general.aliases.bash +++ b/aliases/available/general.aliases.bash @@ -2,26 +2,52 @@ cite about-alias about-alias 'general aliases' # List directory contents -# Source: http://tldp.org/LDP/abs/html/sample-bashrc.html +# Alias source: http://tldp.org/LDP/abs/html/sample-bashrc.html + +local LS_COLOR_OPTION + +case "$OSTYPE" in + linux*) + # Set Linux color option + LS_COLOR_OPTION="--color=auto" + ;; + darwin*) + # Set BSD color optio + LS_COLOR_OPTION="-G" + #Check if coreutils version of if exists + if [[ -x "/usr/local/opt/coreutils/libexec/gnubin/ls" ]]; then + # Check if coreutils path is in $PATH + if [[ ":$PATH:" == *":/usr/local/opt/coreutils/libexec/gnubin:"* ]]; then + # Set Linux color option + LS_COLOR_OPTION="--color" + fi + fi + ;; + *) + # Use Linux color option as fallback + LS_COLOR_OPTION="--color=auto" + ;; +esac + # # Add colors for filetype and human-readable sizes by default on 'ls': -alias l='ls -a --color' # Standard -alias lx='ls -lXB --color' # Sort by extension. -alias lk='ls -lSr --color' # Sort by size, biggest last. -alias lt='ls -ltr --color' # Sort by date, most recent last. -alias lc='ls -ltcr --color' # Sort by/show change time,most recent last. -alias lu='ls -ltur --color' # Sort by/show access time,most recent last. +alias l="ls -a $LS_COLOR_OPTION" # Standard +alias lx="ls -lXB $LS_COLOR_OPTION" # Sort by extension. +alias lk="ls -lSr $LS_COLOR_OPTION" # Sort by size, biggest last. +alias lt="ls -ltr $LS_COLOR_OPTION" # Sort by date, most recent last. +alias lc="ls -ltcr $LS_COLOR_OPTION" # Sort by/show change time,most recent last. +alias lu="ls -ltur $LS_COLOR_OPTION" # Sort by/show access time,most recent last. # # The ubiquitous 'll': directories first, with alphanumeric sorting: -alias ll="ls -lv --group-directories-first --color" -alias lm='ll |more' # Pipe through 'more' -alias lr='ll -R' # Recursive ls. -alias la='ll -A' # Show hidden files. +alias ll="ls -lv --group-directories-first $LS_COLOR_OPTION" +alias lm="ll |more" # Pipe through "more" +alias lr="ll -R" # Recursive ls. +alias la="ll -A" # Show hidden files. -alias tree='tree -C' # Nice alternative to 'recursive ls' ... +alias tree="tree -C" # Nice alternative to "recursive ls" ... -alias sl='ls' -alias l1='ls -1 --group-directories-first --color' +alias sl="ls" +alias l1="ls -1 --group-directories-first $LS_COLOR_OPTION" alias _="sudo" From 245faefd1bfe41f4ad9f84ebd27cec5207032241 Mon Sep 17 00:00:00 2001 From: Reto Haeberli Date: Tue, 8 Sep 2015 19:51:19 +0200 Subject: [PATCH 4/4] ls fixes, removed redundant tree alias --- aliases/available/general.aliases.bash | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash index 1fec85b0..b1bab605 100644 --- a/aliases/available/general.aliases.bash +++ b/aliases/available/general.aliases.bash @@ -11,7 +11,7 @@ case "$OSTYPE" in # Set Linux color option LS_COLOR_OPTION="--color=auto" ;; - darwin*) + darwin*) # Set BSD color optio LS_COLOR_OPTION="-G" #Check if coreutils version of if exists @@ -19,7 +19,7 @@ case "$OSTYPE" in # Check if coreutils path is in $PATH if [[ ":$PATH:" == *":/usr/local/opt/coreutils/libexec/gnubin:"* ]]; then # Set Linux color option - LS_COLOR_OPTION="--color" + LS_COLOR_OPTION="--color=auto" fi fi ;; @@ -44,8 +44,6 @@ alias lm="ll |more" # Pipe through "more" alias lr="ll -R" # Recursive ls. alias la="ll -A" # Show hidden files. -alias tree="tree -C" # Nice alternative to "recursive ls" ... - alias sl="ls" alias l1="ls -1 --group-directories-first $LS_COLOR_OPTION"