Skip to content

Commit

Permalink
use versioned dmg title fixes #2947
Browse files Browse the repository at this point in the history
  • Loading branch information
fffw committed Aug 14, 2015
1 parent e573bb4 commit cf911f2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ flashlight_windows_386.exe
lantern_darwin_amd64
lantern_linux_386
lantern_linux_amd64
lantern_linux_arm
lantern_windows_386.exe
lantern.exe
lantern-installer-unsigned.exe
Expand All @@ -31,8 +32,6 @@ src/github.com/getlantern/autoupdate/_test_app/autoupdate-binary-*
src/github.com/getlantern/autoupdate/_test_app/main
src/github.com/getlantern/flashlight/ui/resources.go
src/github.com/getlantern/flashlight/*.syso
dmgbackground.png
dmgbackground_versioned.svg
src/github.com/getlantern/systray/sysdtray.sdf
src/github.com/getlantern/systray/Debug
src/github.com/getlantern/systray/Release
Expand All @@ -41,3 +40,6 @@ src/github.com/getlantern/systray/systray/Release
src/github.com/getlantern/lantern-mobile/libflashlight.aar
installer-resources/windows/.packaged-lantern.yaml
installer-resources/linux/.packaged-lantern.yaml
installer-resources/darwin/lantern_versioned.dmg.json
installer-resources/darwin/dmgbackground.png
installer-resources/darwin/dmgbackground_versioned.svg
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,8 @@ package-darwin: require-version require-appdmg require-svgexport darwin
rm -rf Lantern.dmg && \
sed "s/__VERSION__/$$VERSION/g" $$INSTALLER_RESOURCES/dmgbackground.svg > $$INSTALLER_RESOURCES/dmgbackground_versioned.svg && \
$(SVGEXPORT) $$INSTALLER_RESOURCES/dmgbackground_versioned.svg $$INSTALLER_RESOURCES/dmgbackground.png 600:400 && \
$(APPDMG) --quiet $$INSTALLER_RESOURCES/lantern.dmg.json Lantern.dmg && \
sed "s/__VERSION__/$$VERSION/g" $$INSTALLER_RESOURCES/lantern.dmg.json > $$INSTALLER_RESOURCES/lantern_versioned.dmg.json && \
$(APPDMG) --quiet $$INSTALLER_RESOURCES/lantern_versioned.dmg.json Lantern.dmg && \
mv Lantern.dmg Lantern.dmg.zlib && \
hdiutil convert -quiet -format UDBZ -o Lantern.dmg Lantern.dmg.zlib && \
rm Lantern.dmg.zlib; \
Expand Down
4 changes: 2 additions & 2 deletions installer-resources/darwin/lantern.dmg.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"title": "Lantern",
"title": "Lantern __VERSION__",
"icon": "../../Lantern.app/Contents/Resources/app.icns",
"background": "dmgbackground.png",
"icon-size": 100,
"contents": [
{ "x": 115, "y": 265, "type": "file", "path": "../../Lantern.app" },
{ "x": 440, "y": 265, "type": "link", "path": "/Applications" }
]
}
}

0 comments on commit cf911f2

Please sign in to comment.