Fixes for 1.4.1

Author: kuiperzone

CHANGES

@@ -3,6 +3,7 @@
 - Bugfix #15: AppImage and Flatpak builds rejected AppStream metadata if conf.AppChangeFileEmpty.
 - Bugfix #14: AppImage failed if conf.IconPaths empty. On Linux a default icon will be used (previously worked but was broken due to change).
 - Bugfix #13: Incorrect </description> tag in AppStream example text (may be uncommented by used)
+- Updated to show CHANGELOG on console only with --verbose command option
 - Ships with: appimagetool 13 (2020-12-31)
 - Tested against: rpmbuild RPM version 4.18.1, dpkg 1.21.21, flatpak-builder 1.2.3, InnoSetup 6.2.2
 

PupNet.Test/PackageBuilderTest.cs

@@ -122,7 +122,7 @@ private void AssertOK(PackageBuilder builder, PackageKind kind)
 
             Assert.EndsWith($"usr/share/applications/net.example.helloworld.desktop", builder.DesktopBuildPath);
 
-            Assert.Equal($"Assets/Icon.svg", builder.IconSource);
+            Assert.Equal($"Assets/Icon.svg", builder.PrimaryIcon);
 
             Assert.Contains($"Assets/Icon.svg", builder.IconPaths.Keys);
             Assert.Contains($"Assets/Icon.32x32.png", builder.IconPaths.Keys);
@@ -141,7 +141,7 @@ private void AssertOK(PackageBuilder builder, PackageKind kind)
             Assert.Null(builder.DesktopBuildPath);
 
             // Linux sep is ok
-            Assert.Equal($"Assets/Icon.ico", builder.IconSource);
+            Assert.Equal($"Assets/Icon.ico", builder.PrimaryIcon);
             Assert.True(builder.IconPaths.Count == 0);
         }
         else

PupNet.pupnet.conf

@@ -38,7 +38,17 @@ DesktopFile =
 StartCommand = pupnet
 PrimeCategory = Development
 MetaFile = Deploy/PupNet.metainfo.xml
-IconFiles =
+IconFiles = """
+    Deploy/PupNet.ico
+    Deploy/PupNet.16x16.png
+    Deploy/PupNet.24x24.png
+    Deploy/PupNet.32x32.png
+    Deploy/PupNet.48x48.png
+    Deploy/PupNet.64x64.png
+    Deploy/PupNet.96x96.png
+    Deploy/PupNet.128x128.png
+    Deploy/PupNet.256x256.png
+"""
 
 # DOTNET PUBLISH
 DotnetProjectPath =

PupNet/BuildHost.cs

@@ -240,18 +240,18 @@ public string ToString(bool verbose)
         AppendPair(sb, nameof(Builder.AppVersion), Builder.AppVersion);
         AppendPair(sb, nameof(Builder.PackageRelease), Builder.PackageRelease);
 
-        if (Configuration.StartCommand != null && Builder.SupportsStartCommand)
+        if (Builder.SupportsStartCommand)
         {
-            AppendPair(sb, nameof(Configuration.StartCommand), Configuration.StartCommand);
+            AppendPair(sb, nameof(Configuration.StartCommand), Configuration.StartCommand ?? "[None]");
         }
         else
         {
-            AppendPair(sb, nameof(Configuration.StartCommand), Configuration.StartCommand + " [Not Supported]");
+            AppendPair(sb, nameof(Configuration.StartCommand), "[Not Supported]");
         }
 
         if (Builder.Kind == PackageKind.Setup)
         {
-            AppendPair(sb, nameof(Configuration.SetupCommandPrompt), Configuration.SetupCommandPrompt);
+            AppendPair(sb, nameof(Configuration.SetupCommandPrompt), Configuration.SetupCommandPrompt ?? "[None]");
         }
 
         AppendHeader(sb, $"OUTPUT: {Arguments.Kind.ToString().ToUpperInvariant()}");
@@ -268,10 +268,11 @@ public string ToString(bool verbose)
         }
 
         AppendSection(sb, $"DESKTOP: {Path.GetFileName(Configuration.DesktopFile)}", ExpandedDesktop);
-        AppendSection(sb, $"CHANGELOG: {Path.GetFileName(Configuration.AppChangeFile)}", Builder.ChangeLog.ToString());
 
         if (verbose)
         {
+            AppendSection(sb, $"CHANGELOG: {Path.GetFileName(Configuration.AppChangeFile)}", Builder.ChangeLog.ToString());
+
             var temp = new StringBuilder();
 
             foreach (var item in Builder.IconPaths)

PupNet/Builders/AppImageBuilder.cs

@@ -216,14 +216,14 @@ public override void Create(string? desktop, string? metainfo)
         Operations.WriteFile(Path.Combine(BuildRoot, Configuration.AppId + ".desktop"), desktop);
         Operations.WriteFile(Path.Combine(BuildRoot, Configuration.AppId + ".appdata.xml"), metainfo);
 
-        if (IconSource != null)
+        if (PrimaryIcon != null)
         {
-            Operations.CopyFile(IconSource, Path.Combine(BuildRoot, Configuration.AppId + Path.GetExtension(IconSource)));
+            Operations.CopyFile(PrimaryIcon, Path.Combine(BuildRoot, Configuration.AppId + Path.GetExtension(PrimaryIcon)));
         }
         else
         {
             // Icon expected on Linux. Defaults to be provided in none in conf
-            throw new InvalidOperationException("Expected IconSource but was null");
+            throw new InvalidOperationException($"Expected {nameof(PrimaryIcon)} but was null");
         }
 
         // IMPORTANT - Create AppRun link

PupNet/Builders/SetupBuilder.cs

@@ -176,7 +176,7 @@ private string GetInnoFile()
         sb.AppendLine($"AppPublisherURL={Configuration.PublisherLinkUrl}");
         sb.AppendLine($"InfoBeforeFile={Configuration.AppChangeFile}");
         sb.AppendLine($"LicenseFile={Configuration.AppLicenseFile}");
-        sb.AppendLine($"SetupIconFile={IconSource}");
+        sb.AppendLine($"SetupIconFile={PrimaryIcon}");
 
         sb.AppendLine($"DefaultGroupName={Configuration.AppFriendlyName}");
         sb.AppendLine($"DefaultDirName={{autopf}}\\{Configuration.AppBaseName}");
@@ -188,9 +188,9 @@ private string GetInnoFile()
 
         sb.AppendLine($"PrivilegesRequired={(Configuration.SetupAdminInstall ? "admin" : "lowest")}");
 
-        if (IconSource != null)
+        if (PrimaryIcon != null)
         {
-            sb.AppendLine($"UninstallDisplayIcon={{app}}\\{Path.GetFileName(IconSource)}");
+            sb.AppendLine($"UninstallDisplayIcon={{app}}\\{Path.GetFileName(PrimaryIcon)}");
         }
 
         if (!string.IsNullOrEmpty(Configuration.SetupSignTool))
@@ -204,9 +204,9 @@ private string GetInnoFile()
         sb.AppendLine($"Source: \"{BuildAppBin}\\*.dll\"; DestDir: \"{{app}}\"; Flags: ignoreversion recursesubdirs createallsubdirs signonce;");
         sb.AppendLine($"Source: \"{BuildAppBin}\\*\"; Excludes: \"*.exe,*.dll\"; DestDir: \"{{app}}\"; Flags: ignoreversion recursesubdirs createallsubdirs;");
 
-        if (IconSource != null)
+        if (PrimaryIcon != null)
         {
-            sb.AppendLine($"Source: \"{IconSource}\"; DestDir: \"{{app}}\"; Flags: ignoreversion recursesubdirs createallsubdirs;");
+            sb.AppendLine($"Source: \"{PrimaryIcon}\"; DestDir: \"{{app}}\"; Flags: ignoreversion recursesubdirs createallsubdirs;");
         }
 
         if (Configuration.SetupCommandPrompt != null)

PupNet/PackageBuilder.cs

@@ -65,15 +65,18 @@ public PackageBuilder(ConfigurationReader conf, PackageKind kind)
         if (IconPaths.Count == 0)
         {
             // Fallback to embedded icons on Linux
+            // Should always empty on non-linux systems
             IconPaths = GetShareIconPaths(Configuration.DesktopTerminal ? DefaultTerminalIcons : DefaultGuiIcons);
         }
 
-        IconSource = GetSourceIcon(kind, Configuration.IconFiles);
+        // Should be ico on Windows, or SVG or PNG on linux
+        PrimaryIcon = GetSourceIcon(kind, Configuration.IconFiles);
 
-        if (IconSource == null)
+        if (PrimaryIcon == null)
         {
+            // It can be null on Windows.
             // Fallback to embedded icons on Linux
-            IconSource = GetSourceIcon(kind, Configuration.DesktopTerminal ? DefaultTerminalIcons : DefaultGuiIcons);
+            PrimaryIcon = GetSourceIcon(kind, Configuration.DesktopTerminal ? DefaultTerminalIcons : DefaultGuiIcons);
         }
 
         // Ignore fact file might not exist if AssertPaths if false (test only)
@@ -347,7 +350,7 @@ public virtual string? MetaBuildPath
     /// On Linux this is the first SVG file encountered, or the largest PNG otherwise. On Windows, it is the first ICO
     /// file encountered. It is a full path to the source icon on build.
     /// </summary>
-    public string? IconSource { get; }
+    public string? PrimaryIcon { get; }
 
     /// <summary>
     /// A sequence of source icon paths (key) and their install destinations (value) under
@@ -729,19 +732,24 @@ private static int GetStandardPngSize(string filename)
                 return item;
             }
 
-            if (!kind.TargetsWindows() && ext == ".svg")
+            if (!kind.TargetsWindows())
             {
-                // Or this for non-windows
-                return item;
-            }
+                // For non-windows
+                if (ext == ".svg")
+                {
+                    // Preferred
+                    return item;
+                }
 
-            // Get biggest PNG
-            int size = GetStandardPngSize(item);
+                // Or biggest PNG
+                int size = GetStandardPngSize(item);
+
+                if (size > max)
+                {
+                    max = size;
+                    rslt = item;
+                }
 
-            if (size > max)
-            {
-                max = size;
-                rslt = item;
             }
         }