From 2228e344f663bfbf9911f22d4ee81f5e48cfede0 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 20 Feb 2024 21:53:52 -0500 Subject: [PATCH] Or, not And --- publish-nix.sh | 4 ++-- publish-win.ps1 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/publish-nix.sh b/publish-nix.sh index 3cf25e4c..52194f62 100644 --- a/publish-nix.sh +++ b/publish-nix.sh @@ -101,14 +101,14 @@ then for RUNTIME in "${RUNTIMES[@]}" do cd $BUILD_FOLDER/Test/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/ - if [ $(echo ${NON_DLL_FRAMEWORKS[@]} | fgrep -w $FRAMEWORK) ] && [ $(echo ${NON_DLL_RUNTIMES[@]} | fgrep -w $RUNTIME) ] + if [ $(echo ${NON_DLL_FRAMEWORKS[@]} | fgrep -w $FRAMEWORK) ] || [ $(echo ${NON_DLL_RUNTIMES[@]} | fgrep -w $RUNTIME) ] then zip -r $BUILD_FOLDER/BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_debug.zip . -x 'CascLib.dll' -x 'mspack.dll' -x 'StormLib.dll' else zip -r $BUILD_FOLDER/BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_debug.zip . fi cd $BUILD_FOLDER/Test/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/ - if [ $(echo ${NON_DLL_FRAMEWORKS[@]} | fgrep -w $FRAMEWORK) ] && [ $(echo ${NON_DLL_RUNTIMES[@]} | fgrep -w $RUNTIME) ] + if [ $(echo ${NON_DLL_FRAMEWORKS[@]} | fgrep -w $FRAMEWORK) ] || [ $(echo ${NON_DLL_RUNTIMES[@]} | fgrep -w $RUNTIME) ] then zip -r $BUILD_FOLDER/BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_release.zip . -x 'CascLib.dll' -x 'mspack.dll' -x 'StormLib.dll' else diff --git a/publish-win.ps1 b/publish-win.ps1 index 9453274b..76cfecc4 100644 --- a/publish-win.ps1 +++ b/publish-win.ps1 @@ -92,7 +92,7 @@ if (!$NO_ARCHIVE.IsPresent) } Set-Location -Path $BUILD_FOLDER\Test\bin\Debug\${FRAMEWORK}\${RUNTIME}\publish\ - if ($VALID_CROSS_PLATFORM_FRAMEWORKS -contains $FRAMEWORK -and $NON_DLL_RUNTIMES -contains $RUNTIME) + if ($VALID_CROSS_PLATFORM_FRAMEWORKS -contains $FRAMEWORK -or $NON_DLL_RUNTIMES -contains $RUNTIME) { 7z a -tzip -x!CascLib.dll -x!mspack.dll -x!StormLib.dll $BUILD_FOLDER\BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_debug.zip * } @@ -101,7 +101,7 @@ if (!$NO_ARCHIVE.IsPresent) 7z a -tzip $BUILD_FOLDER\BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_debug.zip * } Set-Location -Path $BUILD_FOLDER\Test\bin\Release\${FRAMEWORK}\${RUNTIME}\publish\ - if ($VALID_CROSS_PLATFORM_FRAMEWORKS -contains $FRAMEWORK -and $NON_DLL_RUNTIMES -contains $RUNTIME) + if ($VALID_CROSS_PLATFORM_FRAMEWORKS -contains $FRAMEWORK -or $NON_DLL_RUNTIMES -contains $RUNTIME) { 7z a -tzip -x!CascLib.dll -x!mspack.dll -x!StormLib.dll $BUILD_FOLDER\BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_release.zip * }