From 2436972623fcc2f8a74a666fa241ed7a2c5da567 Mon Sep 17 00:00:00 2001
From: philsmd <philsmd@hashcat.net>
Date: Sat, 11 Feb 2017 14:18:42 +0100
Subject: [PATCH] always use the native sed (not gsed) for OSX, #1036

---
 src/Makefile  | 25 ++++++++-----------------
 tools/test.sh | 11 ++++++++++-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index bab6d5b81..3b5bcd274 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,11 +16,6 @@ UNAME                   := $(shell uname -s)
 # we need to strip the windows version number to be able to build hashcat on cygwin hosts
 UNAME                   := $(patsubst CYGWIN_NT-%,CYGWIN,$(UNAME))
 
-##
-## Detect Operating System version
-## 
-OSVERSION		:= $(shell uname -r|cut -d. -f1)
-
 # same for msys
 UNAME                   := $(patsubst MSYS_NT-%,MSYS2,$(UNAME))
 UNAME                   := $(patsubst MINGW32_NT-%,MSYS2,$(UNAME))
@@ -90,16 +85,12 @@ FIND                    := find
 INSTALL                 := install
 RM                      := rm
 SED                     := sed
-SEDOPS			:= -i
+SED_IN_PLACE            := -i
 
 ifeq ($(UNAME),Darwin)
 CC                      := clang
-ifeq ($(OSVERSION),16)
-SED			:= sed
-SEDOPS			:= -i ""
-else
-SED                     := gsed
-endif
+# the sed -i option of OSX requires a parameter for the backup file (we just use "")
+SED_IN_PLACE            := -i ""
 endif
 
 ifeq ($(UNAME),FreeBSD)
@@ -173,10 +164,10 @@ LFLAGS                  := $(LDFLAGS)
 ifeq ($(DEBUG),0)
 CFLAGS                  += -O2
 LFLAGS                  += -s
-else 
+else
 ifeq ($(DEBUG),1)
 CFLAGS                  += -DDEBUG -g -ggdb
-else 
+else
 ifeq ($(DEBUG),2)
 CFLAGS                  += -DDEBUG -g -ggdb
 CFLAGS                  += -fsanitize=address -fno-omit-frame-pointer
@@ -345,9 +336,9 @@ install_docs:
 	$(FIND) masks/    -type f -exec $(INSTALL) -m 644 {}    $(DESTDIR)$(DOCUMENT_FOLDER)/{} \;
 	$(FIND) rules/    -type d -exec $(INSTALL) -m 755 -d    $(DESTDIR)$(DOCUMENT_FOLDER)/{} \;
 	$(FIND) rules/    -type f -exec $(INSTALL) -m 644 {}    $(DESTDIR)$(DOCUMENT_FOLDER)/{} \;
-	$(SED) $(SEDOPS) 's/\.\/hashcat/hashcat/'		$(DESTDIR)$(DOCUMENT_FOLDER)/example0.sh
-	$(SED) $(SEDOPS) 's/\.\/hashcat/hashcat/'		$(DESTDIR)$(DOCUMENT_FOLDER)/example400.sh
-	$(SED) $(SEDOPS) 's/\.\/hashcat/hashcat/'		$(DESTDIR)$(DOCUMENT_FOLDER)/example500.sh
+	$(SED) $(SED_IN_PLACE) 's/\.\/hashcat/hashcat/'         $(DESTDIR)$(DOCUMENT_FOLDER)/example0.sh
+	$(SED) $(SED_IN_PLACE) 's/\.\/hashcat/hashcat/'         $(DESTDIR)$(DOCUMENT_FOLDER)/example400.sh
+	$(SED) $(SED_IN_PLACE) 's/\.\/hashcat/hashcat/'         $(DESTDIR)$(DOCUMENT_FOLDER)/example500.sh
 
 install_shared:
 	$(INSTALL) -m 755 -d                                    $(DESTDIR)$(SHARED_FOLDER)
diff --git a/tools/test.sh b/tools/test.sh
index 2489ec071..4c44cde8d 100755
--- a/tools/test.sh
+++ b/tools/test.sh
@@ -2365,7 +2365,16 @@ if [ "${PACKAGE}" -eq 1 ]; then
 
   # for convenience: 'run package' is default action for packaged test.sh ( + add other defaults too )
 
-  sed -i -e 's/^\(PACKAGE_FOLDER\)=""/\1="$( echo "${BASH_SOURCE[0]}" | sed \"s!test.sh\\$!!\" )"/' \
+  SED_IN_PLACE='-i'
+
+  UNAME=$(uname -s)
+
+  # of course OSX requires us to implement a special case (sed -i "" for the backup file)
+  if [ "${UNAME}" == "Darwin" ] ; then
+    SED_IN_PLACE='-i ""'
+  fi
+
+  sed "${SED_IN_PLACE}" -e 's/^\(PACKAGE_FOLDER\)=""/\1="$( echo "${BASH_SOURCE[0]}" | sed \"s!test.sh\\$!!\" )"/' \
     -e "s/^\(HT\)=0/\1=${HT}/" \
     -e "s/^\(MODE\)=0/\1=${MODE}/" \
     -e "s/^\(ATTACK\)=0/\1=${ATTACK}/" \