diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/mksh/patches/patch-dot_mkshrc | |
parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/mksh/patches/patch-dot_mkshrc')
-rw-r--r-- | package/mksh/patches/patch-dot_mkshrc | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/package/mksh/patches/patch-dot_mkshrc b/package/mksh/patches/patch-dot_mkshrc index 038050e7e..2b215b93e 100644 --- a/package/mksh/patches/patch-dot_mkshrc +++ b/package/mksh/patches/patch-dot_mkshrc @@ -1,21 +1,11 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- mksh.orig/dot.mkshrc 2009-05-30 12:07:24.734860691 +0200 -+++ mksh/dot.mkshrc 2009-05-30 12:07:18.782465058 +0200 -@@ -20,7 +20,7 @@ +--- mksh/dot.mkshrc~ Thu Feb 25 20:48:10 2010 ++++ mksh/dot.mkshrc Sun Feb 28 18:05:10 2010 +@@ -21,7 +21,7 @@ #- - # ~/.mkshrc: mksh initialisation file for interactive shells + # ${ENV:-~/.mkshrc}: mksh initialisation file for interactive shells -: ${EDITOR:=/bin/ed} ${TERM:=vt100} ${HOSTNAME:=$(ulimit -c 0;hostname -s 2>&-)} +: ${EDITOR:=/bin/vi} ${TERM:=vt100} ${HOSTNAME:=$(ulimit -c 0;hostname -s 2>&-)} [[ $HOSTNAME = @(localhost|*([ ])) ]] && HOSTNAME=$(ulimit -c 0;hostname 2>&-) : ${HOSTNAME:=nil}; if (( USER_ID )); then PS1='$'; else PS1='#'; fi function precmd { -@@ -38,7 +38,7 @@ unalias ls - alias l='ls -F' - alias la='l -a' - alias ll='l -l' --alias lo='l -alo' -+alias lo='l -al' - alias which='whence -p' - whence -p rot13 >&- || alias rot13='tr \ - abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ \ |