Skip to content

Commit f159668

Browse files
sideveshsidevesh
committed
Add packageName to CFBundleIdentifier, add .png extension to linuxDesktopFileIconPath and rename darwin app bundle to remove version in the darwin-dmg packaging
1 parent 6a0cb09 commit f159668

File tree

7 files changed

+25
-15
lines changed

7 files changed

+25
-15
lines changed

‎assets/packaging/darwin-bundle/Info.plist.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<key>CFBundleIconFile</key>
1212
<string>icon.icns</string>
1313
<key>CFBundleIdentifier</key>
14-
<string>{{.organizationName}}</string>
14+
<string>{{.organizationName}}.{{.packageName}}</string>
1515
<key>CFBundleInfoDictionaryVersion</key>
1616
<string>6.0</string>
1717
<key>CFBundleLongVersionString</key>

‎cmd/packaging/darwin-dmg.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ var DarwinDmgTask = &packagingTask{
2222
if err != nil {
2323
return "", err
2424
}
25+
appFileOriginalPath := fmt.Sprintf("dmgdir/%s %s.app", applicationName, version)
26+
appFileFinalPath := fmt.Sprintf("dmgdir/%s.app", applicationName)
27+
cmdRenameApp := exec.Command("mv", appFileOriginalPath, appFileFinalPath)
28+
cmdRenameApp.Dir = tmpPath
29+
cmdRenameApp.Stdout = os.Stdout
30+
cmdRenameApp.Stderr = os.Stderr
31+
err = cmdRenameApp.Run()
32+
if err != nil {
33+
return "", err
34+
}
2535
cmdGenisoimage := exec.Command("genisoimage", "-V", packageName, "-D", "-R", "-apple", "-no-pad", "-o", outputFileName, "dmgdir")
2636
cmdGenisoimage.Dir = tmpPath
2737
cmdGenisoimage.Stdout = os.Stdout

‎cmd/packaging/linux-deb.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var LinuxDebTask = &packagingTask{
1919
"usr/share/applications/{{.executableName}}.desktop",
2020
},
2121
linuxDesktopFileExecutablePath: "/usr/lib/{{.packageName}}/{{.executableName}}",
22-
linuxDesktopFileIconPath: "/usr/lib/{{.packageName}}/assets/icon",
22+
linuxDesktopFileIconPath: "/usr/lib/{{.packageName}}/assets/icon.png",
2323
flutterBuildOutputDirectory: "usr/lib/{{.packageName}}",
2424
packagingFunction: func(tmpPath, applicationName, packageName, executableName, version, release string) (string, error) {
2525
outputFileName := fmt.Sprintf("%s_%s_amd64.deb", packageName, version)

‎cmd/packaging/linux-pkg.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var LinuxPkgTask = &packagingTask{
1919
"src/usr/share/applications/{{.executableName}}.desktop",
2020
},
2121
linuxDesktopFileExecutablePath: "/usr/lib/{{.packageName}}/{{.executableName}}",
22-
linuxDesktopFileIconPath: "/usr/lib/{{.packageName}}/assets/icon",
22+
linuxDesktopFileIconPath: "/usr/lib/{{.packageName}}/assets/icon.png",
2323
flutterBuildOutputDirectory: "src/usr/lib/{{.packageName}}",
2424
packagingFunction: func(tmpPath, applicationName, packageName, executableName, version, release string) (string, error) {
2525
cmdMakepkg := exec.Command("makepkg")

‎cmd/packaging/linux-rpm.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var LinuxRpmTask = &packagingTask{
1919
"BUILDROOT/{{.packageName}}-{{.version}}-{{.release}}.x86_64/usr/share/applications/{{.executableName}}.desktop",
2020
},
2121
linuxDesktopFileExecutablePath: "/usr/lib/{{.packageName}}/{{.executableName}}",
22-
linuxDesktopFileIconPath: "/usr/lib/{{.packageName}}/assets/icon",
22+
linuxDesktopFileIconPath: "/usr/lib/{{.packageName}}/assets/icon.png",
2323
flutterBuildOutputDirectory: "BUILD/{{.packageName}}-{{.version}}-{{.release}}.x86_64/usr/lib/{{.packageName}}",
2424
packagingFunction: func(tmpPath, applicationName, packageName, executableName, version, release string) (string, error) {
2525
cmdRpmbuild := exec.Command("rpmbuild", "--define", fmt.Sprintf("_topdir %s", tmpPath), "--define", "_unpackaged_files_terminate_build 0", "-ba", fmt.Sprintf("./SPECS/%s.spec", packageName))

‎cmd/packaging/linux-snap.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var LinuxSnapTask = &packagingTask{
1414
"linux/app.desktop.tmpl": "snap/local/{{.executableName}}.desktop.tmpl",
1515
},
1616
linuxDesktopFileExecutablePath: "/{{.executableName}}",
17-
linuxDesktopFileIconPath: "/icon",
17+
linuxDesktopFileIconPath: "/icon.png",
1818
flutterBuildOutputDirectory: "build",
1919
packagingFunction: func(tmpPath, applicationName, packageName, executableName, version, release string) (string, error) {
2020
cmdSnapcraft := exec.Command("snapcraft")

‎internal/fileutils/rice-box.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func init() {
6767
Filename: "packaging/darwin-bundle/Info.plist.tmpl",
6868
FileModTime: time.Unix(1588579782, 0),
6969

70-
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"),
70+
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"),
7171
}
7272
fileg := &embedded.EmbeddedFile{
7373
Filename: "packaging/darwin-pkg/Distribution.tmpl",
@@ -322,15 +322,15 @@ func init() {
322322
"plugin": dirx,
323323
},
324324
Files: map[string]*embedded.EmbeddedFile{
325-
"README.md": file2,
326-
"app/gitignore": file4,
327-
"app/go.mod": file5,
328-
"app/hover.yaml.tmpl": file6,
329-
"app/icon.png": file7,
330-
"app/main.go": file8,
331-
"app/main_desktop.dart": file9,
332-
"app/options.go": filea,
333-
"packaging/README.md": filec,
325+
"README.md": file2,
326+
"app/gitignore": file4,
327+
"app/go.mod": file5,
328+
"app/hover.yaml.tmpl": file6,
329+
"app/icon.png": file7,
330+
"app/main.go": file8,
331+
"app/main_desktop.dart": file9,
332+
"app/options.go": filea,
333+
"packaging/README.md": filec,
334334
"packaging/darwin-bundle/Info.plist.tmpl": filee,
335335
"packaging/darwin-pkg/Distribution.tmpl": fileg,
336336
"packaging/darwin-pkg/PackageInfo.tmpl": fileh,

0 commit comments

Comments
 (0)