mirror of
https://github.com/velopack/velopack.git
synced 2025-10-25 15:19:22 +00:00
Revert "Replace old appimage runtime with type2-runtime"
This reverts commit 403c33e04a.
This commit is contained in:
@@ -14,6 +14,7 @@ public class AppImageTool
|
||||
compression ??= DefaultCompressionAlgorithm;
|
||||
|
||||
string runtime = machine switch {
|
||||
RuntimeCpu.x86 => HelperFile.AppImageRuntimeX86,
|
||||
RuntimeCpu.x64 => HelperFile.AppImageRuntimeX64,
|
||||
RuntimeCpu.arm64 => HelperFile.AppImageRuntimeArm64,
|
||||
_ => throw new ArgumentOutOfRangeException(nameof(machine), machine, null)
|
||||
@@ -53,7 +54,7 @@ public class AppImageTool
|
||||
|
||||
logger.Info("Converting tar into squashfs filesystem");
|
||||
var tool = HelperFile.FindHelperFile("squashfs-tools\\tar2sqfs.exe");
|
||||
logger.Debug(Exe.RunHostedCommand($"\"{tool}\" -c {compression} -b 128K \"{tmpSquashFile}\" < \"{tmpTarFile}\""));
|
||||
logger.Debug(Exe.RunHostedCommand($"\"{tool}\" -c {compression} \"{tmpSquashFile}\" < \"{tmpTarFile}\""));
|
||||
} else {
|
||||
Exe.AssertSystemBinaryExists("mksquashfs", "sudo apt install squashfs-tools", "brew install squashfs");
|
||||
var tool = "mksquashfs";
|
||||
@@ -66,7 +67,7 @@ public class AppImageTool
|
||||
"-root-owned",
|
||||
"-noappend",
|
||||
"-b",
|
||||
"128K",
|
||||
"16384",
|
||||
"-mkfs-time",
|
||||
"0",
|
||||
];
|
||||
|
||||
@@ -57,9 +57,11 @@ public static class HelperFile
|
||||
[SupportedOSPlatform("macos")]
|
||||
public static string VelopackEntitlements => FindHelperFile("Velopack.entitlements");
|
||||
|
||||
public static string AppImageRuntimeArm64 => FindHelperFile("appimage-runtime-aarch64");
|
||||
public static string AppImageRuntimeArm64 => FindHelperFile("appimagekit-runtime-aarch64");
|
||||
|
||||
public static string AppImageRuntimeX64 => FindHelperFile("appimage-runtime-x86_64");
|
||||
public static string AppImageRuntimeX64 => FindHelperFile("appimagekit-runtime-x86_64");
|
||||
|
||||
public static string AppImageRuntimeX86 => FindHelperFile("appimagekit-runtime-i686");
|
||||
|
||||
public static string SetupPath => FindHelperFile("setup.exe");
|
||||
|
||||
|
||||
8
vendor/THIRD_PARTY_NOTICES.md
vendored
8
vendor/THIRD_PARTY_NOTICES.md
vendored
@@ -11,10 +11,10 @@ This folder contains pre-compiled binaries from a variety of sources. These shou
|
||||
- Can be found at https://github.com/facebook/zstd
|
||||
- License is GPL-2.0 & BSD 3: https://github.com/facebook/zstd/blob/dev/LICENSE, https://github.com/facebook/zstd/blob/dev/COPYING
|
||||
|
||||
### appimage/type2-runtime (continuous Aug 17, 2024)
|
||||
- The "runtime" binaries needed to create a .AppImage for Linux
|
||||
- Can be found at https://github.com/AppImage/type2-runtime
|
||||
- License is MIT https://github.com/AppImage/type2-runtime/blob/main/LICENSE
|
||||
### appimagekit (continuous Mar 8, 2023)
|
||||
- Only include the "runtime" binaries needed to create a .AppImage for Linux
|
||||
- Can be found at https://github.com/AppImage/AppImageKit
|
||||
- License is MIT https://github.com/AppImage/AppImageKit/blob/master/LICENSE
|
||||
|
||||
### squashfs-tools-ng v1.3.0
|
||||
- Squashfs utilities for Windows
|
||||
|
||||
BIN
vendor/appimage-runtime-aarch64
vendored
BIN
vendor/appimage-runtime-aarch64
vendored
Binary file not shown.
BIN
vendor/appimage-runtime-x86_64
vendored
BIN
vendor/appimage-runtime-x86_64
vendored
Binary file not shown.
BIN
vendor/appimagekit-runtime-aarch64
vendored
Normal file
BIN
vendor/appimagekit-runtime-aarch64
vendored
Normal file
Binary file not shown.
BIN
vendor/appimagekit-runtime-i686
vendored
Normal file
BIN
vendor/appimagekit-runtime-i686
vendored
Normal file
Binary file not shown.
BIN
vendor/appimagekit-runtime-x86_64
vendored
Normal file
BIN
vendor/appimagekit-runtime-x86_64
vendored
Normal file
Binary file not shown.
Reference in New Issue
Block a user