diff options
| -rw-r--r-- | utils/mc/Makefile | 6 | ||||
| -rw-r--r-- | utils/mc/patches/010-subshell.patch | 27 |
2 files changed, 11 insertions, 22 deletions
diff --git a/utils/mc/Makefile b/utils/mc/Makefile index 1f031646c..953d0e5ec 100644 --- a/utils/mc/Makefile +++ b/utils/mc/Makefile @@ -6,15 +6,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mc -PKG_VERSION:=4.8.23 -PKG_RELEASE:=2 +PKG_VERSION:=4.8.24 +PKG_RELEASE:=1 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org> PKG_LICENSE:=GPL-3.0-or-later PKG_CPE_ID:=cpe:/a:midnight_commander:midnight_commander PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://ftp.midnight-commander.org/ -PKG_HASH:=dd7f7ce74183307b0df25b5c3e60ad3293fd3d3d27d2f37dd7a10efce13dff1c +PKG_HASH:=859f1cc070450bf6eb4d319ffcb6a5ac29deb0ac0d81559fb2e71242b1176d46 PKG_BUILD_PARALLEL:=1 PKG_FIXUP:=autoreconf gettext-version PKG_BUILD_DEPENDS:=MC_VFS:libtirpc diff --git a/utils/mc/patches/010-subshell.patch b/utils/mc/patches/010-subshell.patch index d66a01731..f9c7497e8 100644 --- a/utils/mc/patches/010-subshell.patch +++ b/utils/mc/patches/010-subshell.patch @@ -1,22 +1,11 @@ --- a/src/subshell/common.c +++ b/src/subshell/common.c -@@ -865,16 +865,9 @@ init_subshell_precmd (char *precmd, size - * "PS1='$($PRECMD)$ '\n", - */ - g_snprintf (precmd, buff_size, -- "precmd() { " -- "if [ ! \"${PWD##$HOME}\" ]; then " -- "MC_PWD=\"~\"; " -- "else " -- "[ \"${PWD##$HOME/}\" = \"$PWD\" ] && MC_PWD=\"$PWD\" || MC_PWD=\"~/${PWD##$HOME/}\"; " -- "fi; " +@@ -877,7 +877,7 @@ init_subshell_precmd (char *precmd, size + "else " + "[ \"${PWD##$HOME/}\" = \"$PWD\" ] && MC_PWD=\"$PWD\" || MC_PWD=\"~/${PWD##$HOME/}\"; " + "fi; " - "echo \"$USER@$(hostname -s):$MC_PWD\"; " -- "pwd>&%d; " -- "kill -STOP $$; " -- "}; " "PRECMD=precmd; " "PS1='$($PRECMD)$ '\n", subshell_pipe[WRITE]); -+ "precmd() { pwd>&%d; kill -STOP $$; }; " -+ "PRECMD=precmd; " -+ "PS1='$(eval $PRECMD)\\u@\\h:\\w\\$ '\n", subshell_pipe[WRITE]); - break; - - case SHELL_ZSH: ++ "echo \"$USER@$HOSTNAME:$MC_PWD\"; " + "pwd>&%d; " + "kill -STOP $$; " + "}; " "PRECMD=precmd; " "PS1='$($PRECMD)$ '\n", subshell_pipe[WRITE]); |