Skip to content

Commit

Permalink
mingit: include awk.exe's ncurses dependency
Browse files Browse the repository at this point in the history
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 <johannes.schindelin@gmx.de>
  • Loading branch information
dscho committed Mar 15, 2017
1 parent f682bb4 commit 437b52c
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions make-file-list.sh
Expand Up @@ -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) &&
Expand Down Expand Up @@ -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/^\///'
Expand Down

0 comments on commit 437b52c

Please sign in to comment.