Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OSX] revert renaming of Bitcoin-Qt.app and use CFBundleDisplayName (partial revert of #6116) #6214

Merged
merged 2 commits into from Jun 3, 2015

Conversation

@jonasschnelli
Copy link
Member

@jonasschnelli jonasschnelli commented Jun 1, 2015

Reverts the renaming of the app bundle, uses "Bitcoin Core" as CFBundleDisplayName and keeps "Bitcoin-Core" as disk image name and title.

@Diapolo
Copy link

@Diapolo Diapolo commented Jun 1, 2015

Were there problems with the new name?

@jonasschnelli
Copy link
Member Author

@jonasschnelli jonasschnelli commented Jun 1, 2015

@laanwj
Copy link
Member

@laanwj laanwj commented Jun 1, 2015

@Diapolo the problem seems to be that there is no upgrade path for applications that change name. People will end up with two versions installed, which can be problematic.It's kind of unfortunate.

@laanwj
Copy link
Member

@laanwj laanwj commented Jun 2, 2015

@jonasschnelli had any luck with the CFBundleDisplayName?

@jonasschnelli
Copy link
Member Author

@jonasschnelli jonasschnelli commented Jun 2, 2015

Start working on it in about 4h.

@jonasschnelli
Copy link
Member Author

@jonasschnelli jonasschnelli commented Jun 2, 2015

Found a solution to keep the application bundle name "Bitcoin-Qt.app" while using "Bitcoin Core" as display name. I'm now forming a proper commit and test it over gitian.

@laanwj
Copy link
Member

@laanwj laanwj commented Jun 2, 2015

Very nice!

@jonasschnelli
Copy link
Member Author

@jonasschnelli jonasschnelli commented Jun 2, 2015

Credits goes to @theuni for sketching this approach. Thanks.

@theuni
Copy link
Member

@theuni theuni commented Jun 2, 2015

Glad this actually worked!

What's the reason for not just adding Base.lproj/InfoPlist.strings in git, though? Looks like we were faking it before with Resources/empty.lproj, but now that we actually have something to put in there, may as well just commit the files and copy them into the bundle during creation.

@jonasschnelli
Copy link
Member Author

@jonasschnelli jonasschnelli commented Jun 2, 2015

The nice thing with faking the file during the make process is that we not add another file containing a static string for the application name. But I agree it's a bit of a hack.

There is also a problem with .DS_Store (positioning) I'd like to fix.
I think this PR is ready by tmr.

@jonasschnelli jonasschnelli force-pushed the jonasschnelli:2015/06/revert_renaming branch from e6e064b to e6be441 Jun 2, 2015
@jonasschnelli jonasschnelli changed the title [OSX] revert renaming of Bitcoin-Qt.app (partial revert of #6116) [OSX] revert renaming of Bitcoin-Qt.app and use CFBundleDisplayName (partial revert of #6116) Jun 2, 2015
@jonasschnelli jonasschnelli force-pushed the jonasschnelli:2015/06/revert_renaming branch 7 times, most recently from 31c0718 to c5773bb Jun 2, 2015
@jonasschnelli
Copy link
Member Author

@jonasschnelli jonasschnelli commented Jun 3, 2015

This is PR final now
Test dmg: https://builds.jonasschnelli.ch/pulls/6214/

Application name shows "Bitcoin Core" but the application bundles name is still "Bitcoin-Qt.app". If you drag "Bitcoin Core" to your /Applications dir, it will ask you if you like to overwrite "Bitcoin-Qt.app".

Prove screens:
OSX10.10
bildschirmfoto 2015-06-03 um 09 38 51

OSX10.7
bildschirmfoto 2015-06-03 um 09 39 54

@fanquake
Copy link
Member

@fanquake fanquake commented Jun 3, 2015

@theuni @jonasschnelli awesome work, will test shortly.

@jonasschnelli jonasschnelli force-pushed the jonasschnelli:2015/06/revert_renaming branch from c5773bb to 0a32a93 Jun 3, 2015
@@ -30,6 +30,12 @@

<key>CFBundleExecutable</key>
<string>Bitcoin-Qt</string>

<key>CFBundleName</key>
<string>Bitcoin-Qt</string>

This comment has been minimized.

@jonasschnelli

jonasschnelli Jun 3, 2015
Author Member

For the records: this is required so that the OS can detect a manual rename of the application. If current (manually renamed) application name is != CFBundleName, it won't use localization over Base.lproj to rename the application display name.

@laanwj laanwj added the macOS label Jun 3, 2015
@laanwj laanwj merged commit 0a32a93 into bitcoin:master Jun 3, 2015
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
laanwj added a commit that referenced this pull request Jun 3, 2015
0a32a93 OSX: use "Bitcoin Core" as Bundle Display Name (Jonas Schnelli)
a2241ea [OSX] revert renaming of Bitcoin-Qt.app (Jonas Schnelli)
@laanwj
Copy link
Member

@laanwj laanwj commented Jun 3, 2015

Backported to 0.11 via 4d435d1 6145fdf .

laanwj added a commit that referenced this pull request Jun 3, 2015
Github-Pull: #6214
Rebased-From: a2241ea
laanwj added a commit that referenced this pull request Jun 3, 2015
Github-Pull: #6214
Rebased-From: 0a32a93
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.