diff options
| author | Daniel Friesel <derf@derf.homelinux.org> | 2009-08-15 01:20:53 +0200 |
|---|---|---|
| committer | Daniel Friesel <derf@derf.homelinux.org> | 2009-08-15 01:20:53 +0200 |
| commit | b0fc1c80bc8d5f94032d6b8827964cfc9bb7e152 (patch) | |
| tree | 7b0f590e363f859d85eae41f9745b270a1de0c11 | |
| parent | 1941fa46a9808f61b16ec445bb4fcccb4e29e527 (diff) | |
| parent | 4c54a8e4ec50bb084fad91aea7e3c66047eab6b5 (diff) | |
Merge branch 'master' of ssh://aneurysm/home/derf/var/packages_root/zsh
| -rw-r--r-- | etc/aliases/default | 2 | ||||
| -rw-r--r-- | etc/functions/mkcd | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/etc/aliases/default b/etc/aliases/default index 4a1755d..a7a983c 100644 --- a/etc/aliases/default +++ b/etc/aliases/default @@ -21,7 +21,7 @@ linux: alias du='du -shD' || alias du='du -shH' # human-readable sizes, mark executables with '*' etc. -linux: alias ls='ls -Fh --color=auto' || +linux: alias ls='ls -h --color=auto' || alias ls='ls -Fh' ## enable alias expansion diff --git a/etc/functions/mkcd b/etc/functions/mkcd index c4a8c5d..bd6158d 100644 --- a/etc/functions/mkcd +++ b/etc/functions/mkcd @@ -7,8 +7,7 @@ if [[ -z $dir ]] { echo "Usage: mkcd <directory name>" > /dev/stderr return 1 } -[[ -d $dir ]] && ls=1 +if [[ -d $dir ]] ls=1 mkdir -p $dir cd $dir -((ls)) && ls -true +if ((ls)) ls --color=auto |