zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wmake: Simplified using -q option on grep

Browse Source
This commit is contained in:
Henry Weller
2020-12-10 16:31:40 +00:00
parent 0a053fc5fe
commit 66131bcd16
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wmake/wmake
View File

@ -374,11 +374,11 @@ cdSource
if [ "$targetType" = "" ] if [ "$targetType" = "" ]
then then
unset targetType unset targetType
if grep -e '^ *LIB *=' "$MakeDir/files" >/dev/null 2>&1 if grep -q -e '^ *LIB *=' "$MakeDir/files"
then then
targetType=libso targetType=libso
fi fi
elif grep -e '^ *EXE *=' "$MakeDir/files" >/dev/null 2>&1 elif grep -q -e '^ *EXE *=' "$MakeDir/files"
then then
# Application. Remove any nonsense targetType # Application. Remove any nonsense targetType
case "$targetType" in case "$targetType" in
@ -436,7 +436,7 @@ fi
case "$targetType" in case "$targetType" in
lib | libo | libso | dep ) lib | libo | libso | dep )
# ... but only if 'LIB' is declared in 'Make/files' # ... but only if 'LIB' is declared in 'Make/files'
if grep -e '^ *LIB *=' "$MakeDir/files" >/dev/null 2>&1 if grep -q -e '^ *LIB *=' "$MakeDir/files"
then then
$make -s -f "$WM_DIR/makefiles/general" MAKE_DIR="$MakeDir" \ $make -s -f "$WM_DIR/makefiles/general" MAKE_DIR="$MakeDir" \
OBJECTS_DIR="$objectsDir" lnInclude OBJECTS_DIR="$objectsDir" lnInclude