Merge pull request msys2#273 from KrullKorg/master

postgresql: wrapped utilities inside winpty.

mingw-w64-postgresql/PKGBUILD

@@ -4,12 +4,14 @@ _realname=postgresql
 
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=9.3.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Libraries for use with PostgreSQL (mingw-w64)"
 arch=('any')
 url="http://www.postgresql.org/"
 license=('custom:PostgreSQL')
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-libxml2" "${MINGW_PACKAGE_PREFIX}-python2")
+makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
+             "${MINGW_PACKAGE_PREFIX}-libxml2"
+             "${MINGW_PACKAGE_PREFIX}-python2")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
         "${MINGW_PACKAGE_PREFIX}-gettext"
         "${MINGW_PACKAGE_PREFIX}-libxml2"
@@ -18,7 +20,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
         "${MINGW_PACKAGE_PREFIX}-zlib"
         "${MINGW_PACKAGE_PREFIX}-tcl"
         "${MINGW_PACKAGE_PREFIX}-libxslt"
-        "${MINGW_PACKAGE_PREFIX}-python2")
+        "${MINGW_PACKAGE_PREFIX}-python2"
+        "winpty-git")
 options=('staticlibs' 'strip')
 source=("http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2"
         postgresql-9.2.4-plperl-mingw.patch
@@ -97,4 +100,14 @@ package() {
   #  install -m644 postgres_ext.h "${pkgdir}${MINGW_PREFIX}/include/"
   #  install -m644 libpq/libpq-fs.h "${pkgdir}${MINGW_PREFIX}/include/libpq/"
   #  install -m644 pg_config_manual.h "${pkgdir}${MINGW_PREFIX}/include/"
+
+  # Use winpty-git script to invoke utilities. Please don't move this into a patch as
+  # hopefully one day we won't need this hack.
+  for f in clusterdb createdb createlang createuser dropdb droplang dropuser initdb pg_basebackup pg_dump pg_dumpall pg_receivexlog pg_restore psql reindexdb vacuumdb; do
+    mv "${pkgdir}"${MINGW_PREFIX}/bin/${f}.exe "${pkgdir}"${MINGW_PREFIX}/bin/${f}_exe
+    _exename="${f}"
+    echo "#!/usr/bin/env bash" > "${pkgdir}${MINGW_PREFIX}/bin/${_exename}"
+    echo '/usr/bin/winpty "$( dirname ${BASH_SOURCE[0]} )/'${_exename}'.exe" "$@"' >> "${pkgdir}${MINGW_PREFIX}/bin/${_exename}"
+    mv "${pkgdir}"${MINGW_PREFIX}/bin/${f}_exe "${pkgdir}"${MINGW_PREFIX}/bin/${f}.exe
+  done
 }