arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-27 02:18:21 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1050 from philsmd/master

Browse Source 
always use the native sed (not gsed) for OSX, #1036
This commit is contained in:
Jens Steube 2017-02-11 15:11:54 +01:00 committed by GitHub
commit 357ed36f00
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Makefile
View File

@ -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)

11
tools/test.sh
View File

@ -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}/" \