Changeset 8641ba2 in freewrt

Timestamp:

Jul 3, 2006, 2:48:48 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

3b38709

Parents:

baf209a

Message:

mksh R26e, and sync with MirOS src/etc/profile,v 1.23
and ports/shells/mksh/pkg/DESCR,v 1.2 (for $PS1) thus
saving a few bytes

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@167 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/mksh

Files:

• Makefile (modified) (1 diff)
• ipkg/mksh.postinst (modified) (2 diffs)

package/mksh/Makefile

@@ -4 +4 @@
 
 PKG_NAME=               mksh
-PKG_VERSION=            27.3
+PKG_VERSION=            27.4
 PKG_RELEASE=            1
-PKG_SOURCE=             ${PKG_NAME}-R27d.cpio.gz
-PKG_MD5SUM=             c35648b7e8842e8d9012570b3f148189
+PKG_SOURCE=             ${PKG_NAME}-R27e.cpio.gz
+PKG_MD5SUM=             2eeb5c5fab32cc7a20ca3c7c2c6fda46
 
 PKG_SOURCE_URL=         http://mirbsd.mirsolutions.de/MirOS/dist/mir/mksh/ \

package/mksh/ipkg/mksh.postinst

@@ -9 +9 @@
         echo 'if test -n "$KSH_VERSION"; then' >>${IPKG_INSTROOT}/etc/profile
         echo '  [[ -z $HOSTNAME ]] && export HOSTNAME=$(</proc/sys/kernel/hostname)' >>${IPKG_INSTROOT}/etc/profile
-        echo '  export PS1='\''$(((rv=$?)) && print "$rv|")'\''"\${USER}@$HOSTNAME:"'\''$(' >>${IPKG_INSTROOT}/etc/profile
+        echo '  export PS1='\''$(((rv=$?)) && print $rv\|)'\''"\$USER@${HOSTNAME:-noFQDN}:"'\''$(' >>${IPKG_INSTROOT}/etc/profile
         echo '          typeset tilde=~ path=${1:-${PWD:-$(pwd)}}' >>${IPKG_INSTROOT}/etc/profile
         echo '          typeset dots= path2=${path#$tilde}' >>${IPKG_INSTROOT}/etc/profile
-        echo '          [[ $path2 = $path || -z $tilde || $tilde = / ]] || path='~'$path2' >>${IPKG_INSTROOT}/etc/profile
+        echo '          [[ $path2 = $path || -z $tilde || $tilde = / ]] || path=\~$path2' >>${IPKG_INSTROOT}/etc/profile
         echo '          let cmax="${COLUMNS:-80} / 3"' >>${IPKG_INSTROOT}/etc/profile
         echo '          (( cmax < 7 )) && let cmax=7' >>${IPKG_INSTROOT}/etc/profile
@@ -24 +24 @@
         echo '                  fi' >>${IPKG_INSTROOT}/etc/profile
         echo '          done' >>${IPKG_INSTROOT}/etc/profile
-        echo '          print -nr -- "$dots$path")'\''" $(if [[ $(id -u) -eq 0 ]]; then' >>${IPKG_INSTROOT}/etc/profile
-        echo '                  echo -n '\''#'\''; else echo -n '\''$'\''; fi) "' >>${IPKG_INSTROOT}/etc/profile
+        echo '          print -nr -- "$dots$path")'\''" $(if (( $(id -u) )); then' >>${IPKG_INSTROOT}/etc/profile
+        echo '                  print -n \$; else print -n \#; fi) "' >>${IPKG_INSTROOT}/etc/profile
         echo 'fi' >>${IPKG_INSTROOT}/etc/profile
 fi