diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cce26267..9df5357c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -153,10 +153,8 @@ jobs: name: tools - name: Decompress OSX run: | - ls -la ./build - ls -la ./build/publish unzip ./squirrel-osx-x64.zip -d ./build/publish - ls -la ./build/publish + mv ./build/publish/7zz ./build/publish/bin/ - name: Create NuGet Package run: | export NUGET_VERSION=$(nbgv get-version -f json | python3 -c "import sys, json; print(json.load(sys.stdin)['NuGetPackageVersion'])") diff --git a/build.ps1 b/build.ps1 index b89ab556..44353849 100644 --- a/build.ps1 +++ b/build.ps1 @@ -33,13 +33,13 @@ dotnet publish -v minimal -c Release -r win-x86 --self-contained=true "$PSScript # Copy over all files we need Write-Output "Copying files to all the right places" -Copy-Item -Path "$PSScriptRoot\vendor\7zip\*" -Destination "$BinOut" -Recurse Copy-Item -Path "$PSScriptRoot\vendor\wix\*" -Destination "$BinOut" -Recurse Copy-Item "$In\Win32\Setup.exe" -Destination "$BinOut" Copy-Item "$In\Win32\StubExecutable.exe" -Destination "$BinOut" Copy-Item "$PSScriptRoot\vendor\rcedit.exe" -Destination "$BinOut" Copy-Item "$PSScriptRoot\vendor\signtool.exe" -Destination "$BinOut" Copy-Item "$PSScriptRoot\vendor\singlefilehost.exe" -Destination "$BinOut" +Copy-Item -Path "$PSScriptRoot\vendor\7za.exe" -Destination "$BinOut" # Clean up files we do not need to create a nuget package Write-Output "Cleaning up intermediate files" diff --git a/gon.config.json b/gon.config.json index f7657e6b..f4f267c0 100644 --- a/gon.config.json +++ b/gon.config.json @@ -1,7 +1,8 @@ { "source": [ "./osx-build/SquirrelMac", - "./osx-build/UpdateMac" + "./osx-build/UpdateMac", + "./vendor/7zz" ], "bundle_id": "com.caesay.squirrel", "sign": { diff --git a/src/Squirrel.CommandLine/HelperFile.cs b/src/Squirrel.CommandLine/HelperFile.cs index 9fc90ec1..d2857a29 100644 --- a/src/Squirrel.CommandLine/HelperFile.cs +++ b/src/Squirrel.CommandLine/HelperFile.cs @@ -44,11 +44,15 @@ namespace Squirrel.CommandLine { var findCommand = SquirrelRuntimeInfo.IsWindows ? "where" : "which"; + // first search the usual places foreach (var n in names) { var helper = FindHelperFile(n, throwWhenNotFound: false); if (helper != null) return helper; - + } + + // then see if there is something on the path + foreach (var n in names) { var result = ProcessUtil.InvokeProcess(findCommand, new[] { n }, null, CancellationToken.None); if (result.ExitCode == 0) { return n; diff --git a/vendor/7za.exe b/vendor/7za.exe new file mode 100644 index 00000000..9544a638 Binary files /dev/null and b/vendor/7za.exe differ diff --git a/vendor/7zip/7z.dll b/vendor/7zip/7z.dll deleted file mode 100644 index b32d7bf7..00000000 Binary files a/vendor/7zip/7z.dll and /dev/null differ diff --git a/vendor/7zip/7z.exe b/vendor/7zip/7z.exe deleted file mode 100644 index 37b8514e..00000000 Binary files a/vendor/7zip/7z.exe and /dev/null differ diff --git a/vendor/7zz b/vendor/7zz new file mode 100644 index 00000000..2f28ba30 Binary files /dev/null and b/vendor/7zz differ diff --git a/vendor/NuGet.exe b/vendor/NuGet.exe deleted file mode 100644 index 4543b4f7..00000000 Binary files a/vendor/NuGet.exe and /dev/null differ