Changeset 3b38709 in freewrt

Timestamp:

Jul 4, 2006, 3:09:40 AM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

8d193bb

Parents:

8641ba2

Message:

• save a few bytes in /etc/profile and the environment
• we use USER, so define it if unset
• export HOSTNAME and USER if defined by us
• bump patchlevel

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

Location:

package/mksh

Files:

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

package/mksh/Makefile

@@ -5 +5 @@
 PKG_NAME=               mksh
 PKG_VERSION=            27.4
-PKG_RELEASE=            1
+PKG_RELEASE=            2
 PKG_SOURCE=             ${PKG_NAME}-R27e.cpio.gz
 PKG_MD5SUM=             2eeb5c5fab32cc7a20ca3c7c2c6fda46

package/mksh/ipkg/mksh.postinst

@@ -8 +8 @@
 if ! grep KSH_VERSION ${IPKG_INSTROOT}/etc/profile >/dev/null 2>&1; then
         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:-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 '          let cmax="${COLUMNS:-80} / 3"' >>${IPKG_INSTROOT}/etc/profile
-        echo '          (( cmax < 7 )) && let cmax=7' >>${IPKG_INSTROOT}/etc/profile
-        echo '          while (( (${#dots} + ${#path}) > cmax )); do' >>${IPKG_INSTROOT}/etc/profile
-        echo '                  if [[ $path = *@(/)* ]]; then' >>${IPKG_INSTROOT}/etc/profile
-        echo '                          dots=.../' >>${IPKG_INSTROOT}/etc/profile
-        echo '                          path="${path#*/}"' >>${IPKG_INSTROOT}/etc/profile
+        echo '  : ${HOSTNAME:=$(hostname -s </proc/sys/kernel/hostname)}' >>${IPKG_INSTROOT}/etc/profile
+        echo '  PS1='\''$(((rv=$?)) && print $rv\|)${USER:=$(id -un)}@${HOSTNAME:=nil}:$(' >>${IPKG_INSTROOT}/etc/profile
+        echo '          typeset pfx=~ wd=${PWD:-$(pwd)}' >>${IPKG_INSTROOT}/etc/profile
+        echo '          [[ ${wd#$pfx} = $wd || $pfx = ?(/) ]] || wd=\~${wd#$pfx}' >>${IPKG_INSTROOT}/etc/profile
+        echo '          pfx=; let n="( (n = ${COLUMNS:-80} / 3) < 7 ? 7 : n)"' >>${IPKG_INSTROOT}/etc/profile
+        echo '          while (( (${#pfx} + ${#wd}) > n )); do' >>${IPKG_INSTROOT}/etc/profile
+        echo '                  if [[ $wd = */* ]]; then' >>${IPKG_INSTROOT}/etc/profile
+        echo '                          pfx=.../' >>${IPKG_INSTROOT}/etc/profile
+        echo '                          wd="${wd#*/}"' >>${IPKG_INSTROOT}/etc/profile
         echo '                  else' >>${IPKG_INSTROOT}/etc/profile
-        echo '                          dots=...' >>${IPKG_INSTROOT}/etc/profile
-        echo '                          path="${path#?????}"' >>${IPKG_INSTROOT}/etc/profile
+        echo '                          pfx=...' >>${IPKG_INSTROOT}/etc/profile
+        echo '                          wd="${wd#?????}"' >>${IPKG_INSTROOT}/etc/profile
         echo '                  fi' >>${IPKG_INSTROOT}/etc/profile
         echo '          done' >>${IPKG_INSTROOT}/etc/profile
-        echo '          print -nr -- "$dots$path")'\''" $(if (( $(id -u) )); then' >>${IPKG_INSTROOT}/etc/profile
+        echo '          print -r -- "$pfx$wd")'\''" $(if (( $(id -u) )); then' >>${IPKG_INSTROOT}/etc/profile
         echo '                  print -n \$; else print -n \#; fi) "' >>${IPKG_INSTROOT}/etc/profile
+        echo '  export HOSTNAME PS1 USER' >>${IPKG_INSTROOT}/etc/profile
         echo 'fi' >>${IPKG_INSTROOT}/etc/profile
 fi