From 437b52cae9d73772f9582efbd45b63335c7a3fb8 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 15 Mar 2017 14:21:58 +0100 Subject: [PATCH] mingit: include awk.exe's ncurses dependency For some really funny reason, awk.exe depends on ncurses: awk features an interactive console backed by libreadline, and that library uses ncurses as termcap library in MSYS2. However, we specifically excluded the `ncurses` package from MinGit, which means that awk.exe fails to even start. Now, that would not be a problem if Git itself was not using awk. But it does: the `git mergetool` command makes use of this helper. So let's include the bare minimum to make awk.exe work, until the time when the mergetool command finally becomes a builtin. Signed-off-by: Johannes Schindelin --- make-file-list.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/make-file-list.sh b/make-file-list.sh index b621a577d0..d273c890d9 100755 --- a/make-file-list.sh +++ b/make-file-list.sh @@ -24,7 +24,7 @@ pacman_list () { -e '^\(.*libtre-git\)$' \ -e '^\(.*-tcl\|.*-tk\|.*-wineditline\)$' \ -e '^\(gdbm\|icu\|libdb\|libedit\|libgdbm\)$' \ - -e '^\(ncurses\|perl\|perl-.*\)$' + -e '^\(perl\|perl-.*\)$' fi | sort | uniq) && @@ -171,7 +171,12 @@ else -e '^/usr/lib/\(awk\|coreutils\|gawk\|openssl\|ssh\)/' \ -e '^/usr/libexec/\(bigram\|code\|frcode\)\.exe$' \ -e '^/usr/share/\(cygwin\|git\)/' \ - -e '^/usr/ssl/misc/' + -e '^/usr/ssl/misc/' \ + -e '^/usr/bin/\(captoinfo\|clear\|infocmp\|infotocap\)\.exe$' \ + -e '^/usr/bin/\(reset\|tabs\|tic\|toe\|tput\|tset\)\.exe$' \ + -e '^/usr/bin/msys-\(formw6\|menuw6\|ncurses++w6\)\.dll$' \ + -e '^/usr/bin/msys-\(panelw6\|ticw6\)\.dll$' \ + -e '^/usr/\(lib\|share\)/terminfo/' -e '^/usr/share/tabset/' fi | sort | grep --perl-regexp -v -e '^/usr/(lib|share)/terminfo/(?!.*/(cygwin|dumb|xterm.*)$)' | sed 's/^\///'