From c268a902ba4ef52b2824504a53815fa5bbdc5b5e Mon Sep 17 00:00:00 2001 From: fo76utils <87907510+fo76utils@users.noreply.github.com> Date: Thu, 12 Dec 2024 19:31:27 +0100 Subject: [PATCH] Fixed sed error on Windows/MSYS2 --- NifSkope_functions.pri | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/NifSkope_functions.pri b/NifSkope_functions.pri index ff203e91..cda7a27b 100644 --- a/NifSkope_functions.pri +++ b/NifSkope_functions.pri @@ -19,37 +19,11 @@ defineReplace(getSed) { sedbin = "" win32 { - PROG = C:/Program Files (x86) - !exists($$PROG) { - PROG = C:/Program Files - } - - GNUWIN32 = $${PROG}/GnuWin32/bin - CYGWIN = C:/cygwin64/bin - MSYS64 = C:/msys64/usr/bin - SEDPATH = /sed.exe - - exists($${MSYS64}$${SEDPATH}) { - sedbin = $${MSYS64}$${QMAKE_DIR_SEP} - } else:exists($${GNUWIN32}$${SEDPATH}) { - sedbin = $${GNUWIN32}$${QMAKE_DIR_SEP} - } else:exists($${CYGWIN}$${SEDPATH}) { - sedbin = $${CYGWIN}$${QMAKE_DIR_SEP} - } else { - #message(Neither GnuWin32 or Cygwin were found) - SEDSYS = $$system(where sed 2> NUL) - SEDLIST = $$split(SEDSYS, "sed.exe") - SEDBIN = $$member(SEDLIST, 0) - sedbin = $$syspath($${SEDBIN}) - } - - !isEmpty(sedbin) { - sedbin = \"$${sedbin}sed.exe\" - } + sedbin = "sed.exe" } unix { - sedbin = sed + sedbin = "sed" } return($$sedbin)