Merge pull request #158 from sidevesh/master

jld3103 · web-flow · commit a478d62e5d3a · 2020-08-10T00:56:00.000+02:00
Add packageName to CFBundleIdentifier, add .png extension to linuxDesktopFileIconPath and rename darwin app bundle to remove version in the darwin-dmg packaging
diff --git a/assets/packaging/darwin-bundle/Info.plist.tmpl b/assets/packaging/darwin-bundle/Info.plist.tmpl
@@ -11,7 +11,7 @@
         <key>CFBundleIconFile</key>
         <string>icon.icns</string>
         <key>CFBundleIdentifier</key>
-        <string>{{.organizationName}}</string>
+        <string>{{.organizationName}}.{{.packageName}}</string>
         <key>CFBundleInfoDictionaryVersion</key>
         <string>6.0</string>
         <key>CFBundleLongVersionString</key>
diff --git a/assets/packaging/darwin-pkg/Distribution.tmpl b/assets/packaging/darwin-pkg/Distribution.tmpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <installer-gui-script minSpecVersion="1">
 	<title>{{.applicationName}}</title>
-	<background alignment="topleft" file="root/Applications/{{.applicationName}} {{.version}}.app/Contents/MacOS/assets/icon.png"/>
+	<background alignment="topleft" file="root/Applications/{{.applicationName}}.app/Contents/MacOS/assets/icon.png"/>
 	<choices-outline>
 	    <line choice="choiceBase"/>
     </choices-outline>
diff --git a/assets/packaging/darwin-pkg/PackageInfo.tmpl b/assets/packaging/darwin-pkg/PackageInfo.tmpl
@@ -1,5 +1,5 @@
 <pkg-info format-version="2" identifier="{{.organizationName}}.base.pkg" version="{{.version}}" install-location="/" auth="root">
 	<bundle-version>
-		<bundle id="{{.organizationName}}" CFBundleIdentifier="{{.organizationName}}.{{.packageName}}" path="./Applications/{{.applicationName}} {{.version}}.app" CFBundleVersion="{{.version}}"/>
+		<bundle id="{{.organizationName}}" CFBundleIdentifier="{{.organizationName}}.{{.packageName}}" path="./Applications/{{.applicationName}}.app" CFBundleVersion="{{.version}}"/>
     </bundle-version>
 </pkg-info>
diff --git a/assets/packaging/linux/app.desktop.tmpl b/assets/packaging/linux/app.desktop.tmpl
@@ -3,6 +3,7 @@ Version=1.0
 Type=Application
 Terminal=false
 Categories=
+Comment={{.description}}
 Name={{.applicationName}}
 Icon={{.iconPath}}
 Exec={{.executablePath}}
diff --git a/cmd/packaging/darwin-dmg.go b/cmd/packaging/darwin-dmg.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"path/filepath"
 )
 
 // DarwinDmgTask packaging for darwin as dmg
@@ -22,6 +23,12 @@ var DarwinDmgTask = &packagingTask{
 		if err != nil {
 			return "", err
 		}
+		appBundleOriginalPath := filepath.Join(tmpPath, "dmgdir", fmt.Sprintf("%s %s.app", applicationName, version))
+		appBundleFinalPath := filepath.Join(tmpPath, "dmgdir", fmt.Sprintf("%s.app", applicationName))
+		err = os.Rename(appBundleOriginalPath, appBundleFinalPath)
+		if err != nil {
+			return "", err
+		}
 		cmdGenisoimage := exec.Command("genisoimage", "-V", packageName, "-D", "-R", "-apple", "-no-pad", "-o", outputFileName, "dmgdir")
 		cmdGenisoimage.Dir = tmpPath
 		cmdGenisoimage.Stdout = os.Stdout
diff --git a/cmd/packaging/darwin-pkg.go b/cmd/packaging/darwin-pkg.go
@@ -27,6 +27,13 @@ var DarwinPkgTask = &packagingTask{
 			return "", err
 		}
 
+		appBundleOriginalPath := filepath.Join(tmpPath, "flat", "root", "Applications", fmt.Sprintf("%s %s.app", applicationName, version))
+		appBundleFinalPath := filepath.Join(tmpPath, "flat", "root", "Applications", fmt.Sprintf("%s.app", applicationName))
+		err = os.Rename(appBundleOriginalPath, appBundleFinalPath)
+		if err != nil {
+			return "", err
+		}
+
 		cmdFind := exec.Command("find", ".")
 		cmdFind.Dir = filepath.Join(tmpPath, "flat", "root")
 		cmdCpio := exec.Command("cpio", "-o", "--format", "odc", "--owner", "0:80")
diff --git a/cmd/packaging/linux-deb.go b/cmd/packaging/linux-deb.go
@@ -19,7 +19,7 @@ var LinuxDebTask = &packagingTask{
 		"usr/share/applications/{{.executableName}}.desktop",
 	},
 	linuxDesktopFileExecutablePath: "/usr/lib/{{.packageName}}/{{.executableName}}",
-	linuxDesktopFileIconPath:       "/usr/lib/{{.packageName}}/assets/icon",
+	linuxDesktopFileIconPath:       "/usr/lib/{{.packageName}}/assets/icon.png",
 	flutterBuildOutputDirectory:    "usr/lib/{{.packageName}}",
 	packagingFunction: func(tmpPath, applicationName, packageName, executableName, version, release string) (string, error) {
 		outputFileName := fmt.Sprintf("%s_%s_amd64.deb", packageName, version)
diff --git a/cmd/packaging/linux-pkg.go b/cmd/packaging/linux-pkg.go
@@ -19,7 +19,7 @@ var LinuxPkgTask = &packagingTask{
 		"src/usr/share/applications/{{.executableName}}.desktop",
 	},
 	linuxDesktopFileExecutablePath: "/usr/lib/{{.packageName}}/{{.executableName}}",
-	linuxDesktopFileIconPath:       "/usr/lib/{{.packageName}}/assets/icon",
+	linuxDesktopFileIconPath:       "/usr/lib/{{.packageName}}/assets/icon.png",
 	flutterBuildOutputDirectory:    "src/usr/lib/{{.packageName}}",
 	packagingFunction: func(tmpPath, applicationName, packageName, executableName, version, release string) (string, error) {
 		cmdMakepkg := exec.Command("makepkg")
diff --git a/cmd/packaging/linux-rpm.go b/cmd/packaging/linux-rpm.go
@@ -19,7 +19,7 @@ var LinuxRpmTask = &packagingTask{
 		"BUILDROOT/{{.packageName}}-{{.version}}-{{.release}}.x86_64/usr/share/applications/{{.executableName}}.desktop",
 	},
 	linuxDesktopFileExecutablePath: "/usr/lib/{{.packageName}}/{{.executableName}}",
-	linuxDesktopFileIconPath:       "/usr/lib/{{.packageName}}/assets/icon",
+	linuxDesktopFileIconPath:       "/usr/lib/{{.packageName}}/assets/icon.png",
 	flutterBuildOutputDirectory:    "BUILD/{{.packageName}}-{{.version}}-{{.release}}.x86_64/usr/lib/{{.packageName}}",
 	packagingFunction: func(tmpPath, applicationName, packageName, executableName, version, release string) (string, error) {
 		cmdRpmbuild := exec.Command("rpmbuild", "--define", fmt.Sprintf("_topdir %s", tmpPath), "--define", "_unpackaged_files_terminate_build 0", "-ba", fmt.Sprintf("./SPECS/%s.spec", packageName))
diff --git a/cmd/packaging/linux-snap.go b/cmd/packaging/linux-snap.go
@@ -14,7 +14,7 @@ var LinuxSnapTask = &packagingTask{
 		"linux/app.desktop.tmpl":         "snap/local/{{.executableName}}.desktop.tmpl",
 	},
 	linuxDesktopFileExecutablePath: "/{{.executableName}}",
-	linuxDesktopFileIconPath:       "/icon",
+	linuxDesktopFileIconPath:       "/icon.png",
 	flutterBuildOutputDirectory:    "build",
 	packagingFunction: func(tmpPath, applicationName, packageName, executableName, version, release string) (string, error) {
 		cmdSnapcraft := exec.Command("snapcraft")
diff --git a/internal/fileutils/rice-box.go b/internal/fileutils/rice-box.go
@@ -67,7 +67,7 @@ func init() {
 		Filename:    "packaging/darwin-bundle/Info.plist.tmpl",
 		FileModTime: time.Unix(1588579782, 0),
 
-		Content: string("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n    <dict>\n        <key>CFBundleDevelopmentRegion</key>\n        <string>English</string>\n        <key>CFBundleExecutable</key>\n        <string>{{.executableName}}</string>\n        <key>CFBundleGetInfoString</key>\n        <string>{{.description}}</string>\n        <key>CFBundleIconFile</key>\n        <string>icon.icns</string>\n        <key>CFBundleIdentifier</key>\n        <string>{{.organizationName}}</string>\n        <key>CFBundleInfoDictionaryVersion</key>\n        <string>6.0</string>\n        <key>CFBundleLongVersionString</key>\n        <string>{{.version}}</string>\n        <key>CFBundleName</key>\n        <string>{{.applicationName}}</string>\n        <key>CFBundlePackageType</key>\n        <string>APPL</string>\n        <key>CFBundleShortVersionString</key>\n        <string>{{.version}}</string>\n        <key>CFBundleSignature</key>\n        <string>{{.organizationName}}.{{.packageName}}</string>\n        <key>CFBundleVersion</key>\n        <string>{{.version}}</string>\n        <key>CSResourcesFileMapped</key>\n        <true/>\n        <key>NSHumanReadableCopyright</key>\n        <string></string>\n    </dict>\n</plist>\n"),
+		Content: string("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n    <dict>\n        <key>CFBundleDevelopmentRegion</key>\n        <string>English</string>\n        <key>CFBundleExecutable</key>\n        <string>{{.executableName}}</string>\n        <key>CFBundleGetInfoString</key>\n        <string>{{.description}}</string>\n        <key>CFBundleIconFile</key>\n        <string>icon.icns</string>\n        <key>CFBundleIdentifier</key>\n        <string>{{.organizationName}}.{{.packageName}}</string>\n        <key>CFBundleInfoDictionaryVersion</key>\n        <string>6.0</string>\n        <key>CFBundleLongVersionString</key>\n        <string>{{.version}}</string>\n        <key>CFBundleName</key>\n        <string>{{.applicationName}}</string>\n        <key>CFBundlePackageType</key>\n        <string>APPL</string>\n        <key>CFBundleShortVersionString</key>\n        <string>{{.version}}</string>\n        <key>CFBundleSignature</key>\n        <string>{{.organizationName}}.{{.packageName}}</string>\n        <key>CFBundleVersion</key>\n        <string>{{.version}}</string>\n        <key>CSResourcesFileMapped</key>\n        <true/>\n        <key>NSHumanReadableCopyright</key>\n        <string></string>\n    </dict>\n</plist>\n"),
 	}
 	fileg := &embedded.EmbeddedFile{
 		Filename:    "packaging/darwin-pkg/Distribution.tmpl",
@@ -85,7 +85,7 @@ func init() {
 		Filename:    "packaging/linux/app.desktop.tmpl",
 		FileModTime: time.Unix(1588579782, 0),
 
-		Content: string("[Desktop Entry]\nVersion=1.0\nType=Application\nTerminal=false\nCategories=\nName={{.applicationName}}\nIcon={{.iconPath}}\nExec={{.executablePath}}\n"),
+		Content: string("[Desktop Entry]\nVersion=1.0\nType=Application\nTerminal=false\nCategories=\nComment={{.description}}\nName={{.applicationName}}\nIcon={{.iconPath}}\nExec={{.executablePath}}\n"),
 	}
 	filek := &embedded.EmbeddedFile{
 		Filename:    "packaging/linux/bin.tmpl",
@@ -322,15 +322,15 @@ func init() {
 			"plugin":                   dirx,
 		},
 		Files: map[string]*embedded.EmbeddedFile{
-			"README.md":                                file2,
-			"app/gitignore":                            file4,
-			"app/go.mod":                               file5,
-			"app/hover.yaml.tmpl":                      file6,
-			"app/icon.png":                             file7,
-			"app/main.go":                              file8,
-			"app/main_desktop.dart":                    file9,
-			"app/options.go":                           filea,
-			"packaging/README.md":                      filec,
+			"README.md":             file2,
+			"app/gitignore":         file4,
+			"app/go.mod":            file5,
+			"app/hover.yaml.tmpl":   file6,
+			"app/icon.png":          file7,
+			"app/main.go":           file8,
+			"app/main_desktop.dart": file9,
+			"app/options.go":        filea,
+			"packaging/README.md":   filec,
 			"packaging/darwin-bundle/Info.plist.tmpl":  filee,
 			"packaging/darwin-pkg/Distribution.tmpl":   fileg,
 			"packaging/darwin-pkg/PackageInfo.tmpl":    fileh,
