Test for executable rather than installation

msys2 · May 21, 2023 · 434066b · 434066b
1 parent 756fcbd
commit 434066b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD
@@ -79,7 +79,7 @@ sha256sums=('SKIP'
             '53c0c2d42bc10f265aa41bc412a6ebc2d98177d9356b0fa9a2a130caec46ac2d'
             'c12da01ede663a4924d0817a0d1bd6082b1380383cfb74cc1cea08f9d73e4902'
             '8cb6b244d39107afc6cff74d919708ffc58b903c42f82d050d1d49bbf31208ab'
-            '91a3fa15bc0ba3e499c9ded87a85c9f4fffc8399dea8e1f4ae5d4f10ea2eda32'
+            '6faceffbf98ef704ebd6b28399c9ad0c029a85164878bf2d0c2f6e7a8e5e13e9'
             'd272176dea508bf0972dde6396ca655e900d509099d0a496bd6a138f98bb48df'
             '7e2a2fc6799ed8a9dbc8b0712b162be963ed22351e4cb29b3a4d4a4d3f28d7ed'
             '953b66200dbe4f5b3a9caac2ce25f1ded7918232dce2e61b4bf64f5d87892d07'

diff --git a/pacman/makepkg-mingw b/pacman/makepkg-mingw
@@ -121,18 +121,15 @@ for _mingw in ${MINGW_ARCH}; do
     'ucrt64')
       MINGW_PACKAGE_PREFIX='mingw-w64-ucrt-x86_64';;
   esac
-  _installed_packages=$(pacman -Q)
-  for _package in $_installed_packages; do
-    if [ $_package = ${MINGW_PACKAGE_PREFIX}-file ]; then
-       print_warning "${MINGW_PACKAGE_PREFIX}-file is installed, which is known to cause issues in package builds."
-    fi
-    if [ $_package = ${MINGW_PACKAGE_PREFIX}-grep ]; then
-       print_warning "${MINGW_PACKAGE_PREFIX}-grep is installed, which is known to cause issues in package builds."
-    fi
-    if [ $_package = ${MINGW_PACKAGE_PREFIX}-sed ]; then
-       print_warning "${MINGW_PACKAGE_PREFIX}-sed is installed, which is known to cause issues in package builds."
-    fi
-  done
+  if test -f "/${_mingw}/bin/file.exe"; then
+    print_warning "${MINGW_PACKAGE_PREFIX}-file is installed, which is known to cause issues in package builds."
+  fi
+  if test -f "/${_mingw}/bin/grep.exe"; then
+    print_warning "${MINGW_PACKAGE_PREFIX}-grep is installed, which is known to cause issues in package builds."
+  fi
+  if test -f "/${_mingw}/bin/sed.exe"; then
+    print_warning "${MINGW_PACKAGE_PREFIX}-sed is installed, which is known to cause issues in package builds."
+  fi
 
   print_msg2 "Building ${_mingw}..."