Skip to content

Commit

Permalink
fix: use -comp instread of --comp
Browse files Browse the repository at this point in the history
  • Loading branch information
develar committed Mar 6, 2018
1 parent 3fe37c9 commit b494578
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .idea/dictionaries/develar.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/appimage/appImage.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,12 @@ func createSquashFs(options AppImageOptions, offset int) error {
}

var args []string
args = append(args, *options.stageDir, *options.output, "-offset", strconv.Itoa(offset), "-all-root", "-noappend", "-no-progress", "-quiet")
args = append(args, *options.stageDir, *options.output, "-offset", strconv.Itoa(offset), "-all-root", "-noappend", "-no-progress", "-quiet", "-no-xattrs", "-no-fragments")
// "-mkfs-fixed-time", "0" not available for mac yet (since AppImage developers don't provide actual version of mksquashfs for macOS and no official mksquashfs build for macOS)
if *options.compression != "" {
// default gzip compression - 51.9, xz - 50.4 difference is negligible, start time - well, it seems, a little bit longer (but on Parallels VM on external SSD disk)
// so, to be decided later, is it worth to use xz by default
args = append(args, "--comp", *options.compression)
args = append(args, "-comp", *options.compression)
if *options.compression == "xz" {
//noinspection SpellCheckingInspection
args = append(args, "-Xdict-size", "100%", "-b", "16384")
Expand Down
2 changes: 1 addition & 1 deletion pkg/snap/snap.go
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ func buildWithoutDockerUsingTemplate(templateFile string, options SnapOptions) e

// will be not merged into root if pass several source dirs, so, call for each source dir
for _, sourceDir := range []string{*options.stageDir, *options.appDir} {
err = util.Execute(exec.Command(mksquashfsPath, sourceDir, *options.output, "-no-progress", "-all-root", "-no-duplicates", "-no-recovery"), "")
err = util.Execute(exec.Command(mksquashfsPath, sourceDir, *options.output, "-no-progress", "-quiet", "-all-root", "-no-duplicates", "-no-recovery"), "")
if err != nil {
return errors.WithStack(err)
}
Expand Down

0 comments on commit b494578

Please sign in to comment.