cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-29 23:18:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

mksh: bump to R55 and use PKG_HASH

Browse Source 
Upgrade the package to R55. Patches refreshed.

Added `-DMKSHRC_PATH=\"/etc/mkshrc\"` to `CPPFLAGS` to set the default
startup file during both login and nonlogin sessions, so that there is
no need to source `/etc/mkshrc` file manually.

In addition to the package upgrade, use PKG_HASH instead of
PKG_MD5SUM.

Reviewed-by: Thorsten Glaser <tg@mirbsd.org>
Signed-off-by: Alif M. Ahmad <alive4ever@live.com>
This commit is contained in:
Alif M. Ahmad
2017-07-20 15:05:17 +00:00
parent 93fd35200f
commit 369ff9d1c9
2 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/mksh/patches/100-dot_mkshrc
+26 -30
View File
@@ -1,5 +1,3 @@
Refreshed for mksh-r54, based on tg's patch
From 23712cea8e2a623fd952eb781df0011c501703d0 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Thu, 25 Jul 2013 22:07:33 +0200
@@ -10,37 +8,35 @@ Subject: [PATCH] Make default mkshrc file suitable for OpenWrt environment:
- ls(1) has no -o option
* OpenWrt and FreeWRT-1.0 fix:
- since this is not ~/.mkshrc make sure subshells find it
From: Alif M. A. <alive4ever@live.com>
Date: Thu, 20 Jul 2017 14:52:39 +0000
Subject: [PATCH] Refresh 100-dot_mkshrc for mksh-R55
Additional changes of the patch as of mksh-R55
* Use content of `/proc/sys/kernel/hostname` to set `$HOSTNAME`, since
`hostname` applet isn't compiled into `busybox`.
* Use `/bin/vi` as fallback `$EDITOR`.
* Use `/etc/mkshrc` as default startup file, so there is no need to
manually source it during interactive session.
---
Reviewed-by: Thorsten Glaser <tg at mirbsd.org>
Signed-off-by: Alif M. A. <alive4ever at live.com>
--- a/dot.mkshrc
+++ b/dot.mkshrc
@@ -28,8 +28,9 @@
*) return 0 ;;
esac
@@ -56,10 +56,9 @@
done
)
-PS1='#'; (( USER_ID )) && PS1='$'; \: "${TERM:=vt100}${HOSTNAME:=$(\ulimit -c \
- 0; hostname 2>/dev/null)}${EDITOR:=/bin/ed}${USER:=$(\ulimit -c 0; id -un \
+PS1='#'; (( USER_ID )) && PS1='$'; \: "${HOSTNAME:=$(</proc/sys/kernel/hostname\
+ )} = *([ ]|localhost) && HOSTNAME=$(\ulimit -c \
+ 0; hostname 2>/dev/null)}${EDITOR:=/bin/vi}${USER:=$(\ulimit -c 0; id -un \
2>/dev/null || \echo \?)}${MKSH:=$(\builtin whence -p mksh)}"
HOSTNAME=${HOSTNAME%%*([ ]).*}; HOSTNAME=${HOSTNAME##*([ ])}
[[ $HOSTNAME = ?(ip6-)localhost?(6) ]] && HOSTNAME=
@@ -52,7 +53,7 @@
\alias l='ls -F'
\alias la='l -a'
\alias ll='l -l'
-\alias lo='l -alo'
+\alias lo='l -al'
\alias doch='sudo mksh -c "$(\builtin fc -ln -1)"'
\command -v rot13 >/dev/null || \alias rot13='tr \
abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ \
@@ -600,4 +601,8 @@
-\\builtin alias ls=ls l='ls -F' la='l -a' ll='l -l' lo='l -alo'
-\: "${HOSTNAME:=$(\\builtin ulimit -c 0; \\builtin print -r -- $(hostname \
- 2>/dev/null))}${EDITOR:=/bin/ed}${TERM:=vt100}${USER:=$(\\builtin ulimit \
- -c 0; id -un 2>/dev/null)}${USER:=?}"
+\\builtin alias ls=ls l='ls -F' la='l -a' ll='l -l' lo='l -al'
+\: "${HOSTNAME:=$(</proc/sys/kernel/hostname)}${EDITOR:=/bin/vi}${TERM:=vt100}\
+ ${USER:=$(\\builtin ulimit -c 0; id -un 2>/dev/null)}${USER:=?}"
[[ $HOSTNAME = ?(?(ip6-)localhost?(6)) ]] && HOSTNAME=nil; \\builtin unalias ls
\\builtin export EDITOR HOSTNAME TERM USER
\unset p
+# we need this in OpenWrt for subshells that are not login shells
+\: ${ENV=/etc/mkshrc}
+[[ -z $ENV ]] || export ENV
+
\: place customisations above this line