Skip to content

Add zstd and Xcompression-level support #1091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add zstd and Xcompression-level support #1091

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions src/appimagetool.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ static gboolean guess_update_information = FALSE;
gchar *bintray_user = NULL;
gchar *bintray_repo = NULL;
gchar *sqfs_comp = "gzip";
gchar *sqfs_compression_level = NULL;
gchar *exclude_file = NULL;
gchar *runtime_file = NULL;
gchar *sign_args = NULL;
Expand Down Expand Up @@ -157,23 +158,25 @@ int sfs_mksquashfs(char *source, char *destination, int offset) {
args[i++] = offset_string;
args[i++] = "-comp";

if (use_xz)
args[i++] = "xz";
else
args[i++] = sqfs_comp;

args[i++] = "-root-owned";
args[i++] = "-noappend";

if (use_xz) {
args[i++] = "xz";
// https://jonathancarter.org/2015/04/06/squashfs-performance-testing/ says:
// improved performance by using a 16384 block size with a sacrifice of around 3% more squashfs image space
args[i++] = "-Xdict-size";
args[i++] = "100%";
args[i++] = "-b";
args[i++] = "16384";
} else {
args[i++] = sqfs_comp;
if (sqfs_compression_level != NULL) {
args[i++] = "-Xcompression-level";
args[i++] = sqfs_compression_level;
}
}

args[i++] = "-root-owned";
args[i++] = "-noappend";

// check if ignore file exists and use it if possible
if (access(APPIMAGEIGNORE, F_OK) >= 0) {
printf("Including %s", APPIMAGEIGNORE);
Expand Down Expand Up @@ -470,6 +473,7 @@ static GOptionEntry entries[] =
{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Produce verbose output", NULL },
{ "sign", 's', 0, G_OPTION_ARG_NONE, &sign, "Sign with gpg[2]", NULL },
{ "comp", 0, 0, G_OPTION_ARG_STRING, &sqfs_comp, "Squashfs compression", NULL },
{ "Xcompression-level", 0, 0, G_OPTION_ARG_STRING, &sqfs_compression_level, "Squashfs compression level (need comp=gzip|lzo|zstd)", NULL },
{ "no-appstream", 'n', 0, G_OPTION_ARG_NONE, &no_appstream, "Do not check AppStream metadata", NULL },
{ "exclude-file", 0, 0, G_OPTION_ARG_STRING, &exclude_file, _exclude_file_desc, NULL },
{ "runtime-file", 0, 0, G_OPTION_ARG_STRING, &runtime_file, "Runtime file to use", NULL },
Expand Down