packages: mksh/mksh.spec, mksh/mksh-mkshrc (NEW), mksh/mksh-mkshrc_support....
draenog
draenog at pld-linux.org
Thu Jul 7 13:59:04 CEST 2011
Author: draenog Date: Thu Jul 7 11:59:04 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- mkshrc_support.patch: add support for system wide mkshrc file, change
name of i variable in tests as it is unset by PLD shrcd files
- mkshrc file copied from pdksh package
---- Files affected:
packages/mksh:
mksh.spec (1.12 -> 1.13) , mksh-mkshrc (NONE -> 1.1) (NEW), mksh-mkshrc_support.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/mksh/mksh.spec
diff -u packages/mksh/mksh.spec:1.12 packages/mksh/mksh.spec:1.13
--- packages/mksh/mksh.spec:1.12 Wed Jul 6 18:24:41 2011
+++ packages/mksh/mksh.spec Thu Jul 7 13:58:59 2011
@@ -9,6 +9,8 @@
Group: Applications/Shells
Source0: http://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.cpio.gz
# Source0-md5: 395a6c5f39c7e2afd8f6504d90ca90bd
+Source1: %{name}-mkshrc
+Patch0: %{name}-mkshrc_support.patch
URL: https://www.mirbsd.org/mksh.htm
%if %{with tests}
BuildRequires: ed
@@ -48,6 +50,8 @@
gzip -dc %{SOURCE0} | cpio -mid
mv mksh/* .; rmdir mksh
+%patch0 -p0
+
%build
CC="%{__cc}" CFLAGS="%{rpmcppflags} %{rpmcflags}" sh ./Build.sh -Q -r -j
@@ -58,6 +62,7 @@
install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
install -p mksh $RPM_BUILD_ROOT%{_bindir}/mksh
cp -a mksh.1 $RPM_BUILD_ROOT%{_mandir}/man1/mksh.1
+install -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mkshrc
%clean
rm -rf $RPM_BUILD_ROOT
@@ -73,6 +78,7 @@
%files
%defattr(644,root,root,755)
%doc dot.mkshrc
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/mkshrc
%attr(755,root,root) %{_bindir}/mksh
%{_mandir}/man1/mksh.1*
@@ -82,6 +88,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.13 2011/07/07 11:58:59 draenog
+- mkshrc_support.patch: add support for system wide mkshrc file, change
+ name of i variable in tests as it is unset by PLD shrcd files
+- mkshrc file copied from pdksh package
+
Revision 1.12 2011/07/06 16:24:41 draenog
- adapterized
- rel. 1
================================================================
Index: packages/mksh/mksh-mkshrc
diff -u /dev/null packages/mksh/mksh-mkshrc:1.1
--- /dev/null Thu Jul 7 13:59:04 2011
+++ packages/mksh/mksh-mkshrc Thu Jul 7 13:58:59 2011
@@ -0,0 +1,49 @@
+# For interactive shell
+
+# PROMPT
+if [ `id -u` -eq 0 ]; then
+ PS1='[${LOGNAME-$USER}@${HOSTNAME} `
+ if [ "$PWD" = "$HOME" ]; then
+ echo "~";
+ elif [ "$PWD" = "/${PWD##*/}" ]; then
+ echo $PWD;
+ else
+ echo ${PWD##*/};
+ fi`]# '
+else
+ PS1='[${LOGNAME-$USER}@${HOSTNAME} `
+ if [ "$PWD" = "$HOME" ]; then
+ echo "~";
+ elif [ "$PWD" = "/${PWD##*/}" ]; then
+ echo $PWD;
+ else
+ echo ${PWD##*/};
+ fi`]$ '
+fi
+export PS1
+
+# EDITING FUNCTIONS
+set -o emacs
+bind '^I'=complete >/dev/null 2>&1
+bind '^I'=complete-list >/dev/null 2>&1
+
+case $TERM in
+ nxterm|xterm*|konsole*)
+ bind '^[[H'=beginning-of-line >/dev/null 2>&1
+ bind '^[[F'=end-of-line >/dev/null 2>&1
+ ;;
+ linux|rxvt*)
+ bind '^[[1~'=beginning-of-line >/dev/null 2>&1
+ bind '^[[4~'=end-of-line >/dev/null 2>&1
+ ;;
+esac
+
+# SYSTEM WIDE ALIASES ETC.
+if [ "`echo /etc/shrc.d/*.sh`" != "/etc/shrc.d/*.sh" ]; then
+ for i in /etc/shrc.d/*.sh ; do
+ . $i
+ done
+ unset i
+fi
+
+# vi:syntax=sh
================================================================
Index: packages/mksh/mksh-mkshrc_support.patch
diff -u /dev/null packages/mksh/mksh-mkshrc_support.patch:1.1
--- /dev/null Thu Jul 7 13:59:04 2011
+++ packages/mksh/mksh-mkshrc_support.patch Thu Jul 7 13:58:59 2011
@@ -0,0 +1,33 @@
+--- main.c~ 2011-07-06 20:43:36.679601770 +0100
++++ main.c 2011-07-06 20:43:28.039694865 +0100
+@@ -532,6 +532,7 @@
+ else if (Flag(FTALKING)) {
+ char *env_file;
+
++ include("/etc/mkshrc", 0, NULL, 1);
+ /* include $ENV */
+ env_file = substitute(substitute("${ENV:-" MKSHRC_PATH "}", 0),
+ DOTILDE);
+--- check.t~ 2011-07-07 09:55:26.802497928 +0100
++++ check.t 2011-07-07 09:55:31.859107570 +0100
+@@ -5908,13 +5908,13 @@
+ Ensure ±U on the command line is honoured
+ (this test may pass falsely depending on CPPFLAGS)
+ stdin:
+- export i=0
+- code='if [[ $- = *U* ]]; then echo $i on; else echo $i off; fi'
+- let i++; "$__progname" -U -c "$code"
+- let i++; "$__progname" +U -c "$code"
+- let i++; "$__progname" -U -ic "$code"
+- let i++; "$__progname" +U -ic "$code"
+- echo $((++i)) done
++ export iter=0
++ code='if [[ $- = *U* ]]; then echo $iter on; else echo $iter off; fi'
++ let iter++; "$__progname" -U -c "$code"
++ let iter++; "$__progname" +U -c "$code"
++ let iter++; "$__progname" -U -ic "$code"
++ let iter++; "$__progname" +U -ic "$code"
++ echo $((++iter)) done
+ expected-stdout:
+ 1 on
+ 2 off
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mksh/mksh.spec?r1=1.12&r2=1.13&f=u
More information about the pld-cvs-commit
mailing list