Changeset 849d452 in freewrt for package/mksh/patches

Timestamp:

May 3, 2013, 3:51:18 PM (13 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

53fa986

Parents:

ee36332

Message:

mksh R46

git-svn-id: ​svn://www.freewrt.org/branches/freewrt_1_0@4027 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• package/mksh/patches/patch-dot_mkshrc (modified) (3 diffs)

package/mksh/patches/patch-dot_mkshrc

@@ -3 +3 @@
         • FreeWRT patches:
           – no hostname(1)
+          – yofuh doesn’t like $? in $PS1
           – ls(1) has no -o option
-          – yofuh doesn’t like $? in $PS1
         • OpenWrt and FreeWRT-1.0 adjustment:
           – since this is not ~/.mkshrc make sure subshells find it
 
---- mksh/dot.mkshrc~    2013-04-05 15:40:17.000000000 +0000
-+++ mksh/dot.mkshrc     2013-04-30 20:22:13.619440123 +0000
-@@ -22,13 +22,15 @@
- #-
- # ${ENV:-~/.mkshrc}: mksh initialisation file for interactive shells
+--- mksh/dot.mkshrc~    2013-05-02 22:00:13.000000000 +0000
++++ mksh/dot.mkshrc     2013-05-03 13:46:54.016803654 +0000
+@@ -28,13 +28,15 @@ case $KSH_VERSION in
+ *) return 0 ;;
+ esac
  
 -PS1='#'; (( USER_ID )) && PS1='$'; [[ ${HOSTNAME:=$(ulimit -c 0; hostname -s \
@@ -19 +19 @@
 +    )} = *([    ]|localhost) ]] && HOSTNAME=$(ulimit -c 0; hostname \
      2>/dev/null); : ${EDITOR:=/bin/ed} ${HOSTNAME:=nil} ${TERM:=vt100}
- function precmd {
+ : ${MKSH:=$(whence -p mksh)}; PS4='[$EPOCHREALTIME] '; PS1=$'\001\r''${|
         local e=$?
  
--       (( e )) && print -n "$e|"
+-       (( e )) && REPLY+="$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|"
-        # precmd is required to retain the errorlevel when ${ …;} is used
-        return $e
- }
-@@ -43,7 +45,7 @@ unalias ls
++#      (( e )) && REPLY+="$e|"
+        REPLY+=${USER:=$(ulimit -c 0; id -un 2>/dev/null || echo \?)}
+        REPLY+=@${HOSTNAME%%.*}:
+ 
+@@ -50,7 +52,7 @@ unalias ls
  alias l='ls -F'
  alias la='l -a'
@@ -38 +38 @@
  whence -p rot13 >/dev/null || alias rot13='tr \
      abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ \
-@@ -373,4 +375,8 @@ alias cls='print -n \\033c'
+@@ -413,4 +415,8 @@ alias cls='print -n \\033c'
  
  unset p