*: License under GPL v3+.

[config/dotfiles.git] / shell / aliases

diff --git a/shell/aliases b/shell/aliases
index 5484fc9aedf2ba358682978798efeb4bf49a880f..98e2931a90f9bd46c0694da5dae60026ceb09231 100644 (file)
--- a/shell/aliases
+++ b/shell/aliases
@@ -1,14 +1,32 @@
 # Aliases and similar functions which can be used by all shells (supporting
 # them).
 
+# Copyright (C) 2011-2012  Simon Ruderich
+#
+# This file is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+
 
 # Shortcuts for often used programs.
-alias c='clear'
-alias e='elinks'
-alias g='git'
-alias m='mutt'
-alias v='vim'
-alias vi='vim'
+alias c=clear
+alias d=cd
+alias e=elinks
+alias g=git
+alias l=ls
+alias m=mutt
+alias p=less # p for pager
+alias s=mpc  # s for sound, m is already used
+alias v=vim
 
 
 # Improved ls which displays the files in columns (-C), visualizes
@@ -35,7 +53,7 @@ fi
 # Main ls function, separated to prevent code duplication.
 ls_path=`which ls`
 my_ls() {
-    "$ls_path" -C -F $* 2>&1 | less
+    "$ls_path" -C -F "$@" 2>&1 | less
 }
 # Make sure there is no alias named ls as it causes problems with the
 # following ls function on (at least) bash 4.0.35.
@@ -43,27 +61,31 @@ unalias ls 2> /dev/null
 # GNU ls with colors.
 if [ x$ls_color = xgnu ]; then
     ls() {
-        my_ls --color $*
+        my_ls --color "$@"
     }
 # Normal ls with colors.
 elif [ x$ls_color = xcli ]; then
     ls() {
-        CLICOLOR_FORCE=1 my_ls $*
+        CLICOLOR_FORCE=1 my_ls -G "$@"
     }
 # Simple ls with no colors.
 else
     ls() {
-        my_ls $*
+        my_ls "$@"
     }
 fi
 unset ls_color
 # Helper function to list all files.
 la() {
-    ls -a $*
+    ls -a "$@"
 }
-# Helper function to list all files in list format with access rights, etc.
+# Helper function to list the files in list format with access rights, etc.
 ll() {
-    la -l $*
+    ls -l "$@"
+}
+# Helper function to list all files in list format with access rights, etc.
+lal() {
+    la -l "$@"
 }