diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/mksh/patches/patch-dot_mkshrc | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/mksh/patches/patch-dot_mkshrc')
| -rw-r--r-- | package/mksh/patches/patch-dot_mkshrc | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/package/mksh/patches/patch-dot_mkshrc b/package/mksh/patches/patch-dot_mkshrc index 13093bb79..038050e7e 100644 --- a/package/mksh/patches/patch-dot_mkshrc +++ b/package/mksh/patches/patch-dot_mkshrc @@ -1,31 +1,16 @@ -$Id$ - - • OpenADK patches: - – no hostname(1) - – ls has no -o - – yofuh doesn’t like $? in $PS1 - ---- mksh.orig/dot.mkshrc Sat May 17 18:27:55 2008 -+++ mksh/dot.mkshrc Mon Jul 21 21:02:05 2008 -@@ -2,13 +2,15 @@ +$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 @@ #- # ~/.mkshrc: mksh initialisation file for interactive shells -: ${EDITOR:=/bin/ed} ${TERM:=vt100} ${HOSTNAME:=$(ulimit -c 0;hostname -s 2>&-)} -+: ${EDITOR:=/bin/ed} ${TERM:=vt100} ${HOSTNAME:=$(</proc/sys/kernel/hostname)} ++: ${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 { - typeset -i e=$? - -- (( e )) && print -n "$e|" -+# enable this back if you want the errorlevel in your prompt -+# this is default in upstream mksh, disabled locally in fwrt -+# (( e )) && print -n "$e|" - } - PS1='$(precmd)${USER:=$(ulimit -c 0;id -un 2>&- || print \?)}@${HOSTNAME%%.*}:$( - typeset pfx=~ wd=${PWD:-?} -@@ -30,7 +32,7 @@ unalias ls +@@ -38,7 +38,7 @@ unalias ls alias l='ls -F' alias la='l -a' alias ll='l -l' |