/snapcraft-desktop-helpers

Tweak LOCPATH export to point to the snap root. #39

Merged
merged 1 commit into from Jan 30, 2017

Conversation

Reviewers

@tjyrinki tjyrinki

@didrocks didrocks

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@oSoMoN @didrocks @tjyrinki
@oSoMoN
Contributor

oSoMoN commented Jan 20, 2017 •
Edited 1 time

Allow snaps to override LOCPATH to point to a different location within the snap.
@tjyrinki

tjyrinki approved these changes Jan 25, 2017
View changes

Makes sense!

@didrocks
Owner

didrocks commented Jan 30, 2017

Hey! This looks good (I have no clue of LOCPATH myself. Does it work for standalone apps? (those not depending on ubuntu-app-platform, but just desktop-qt5 for instance?).

Also, now that I'm back, I did merge and refactor the whole runtime logic, do you mind rebasing on that?
@didrocks

didrocks requested changes Jan 30, 2017
View changes

Small rebase requested

@oSoMoN
Tweak LOCPATH export to point to the snap root. 
Allow snaps to override LOCPATH to point to a different location within the snap.
f1ed0d9

@oSoMoN oSoMoN changed the title from Remove spurious LOCPATH export. to Tweak LOCPATH export to point to the snap root. Jan 30, 2017

@oSoMoN
Contributor

oSoMoN commented Jan 30, 2017

I rebased on the latest changes in master, and took a slightly different approach, now that this export is no longer qt-specific:

  • replace $RUNTIME by $SNAP in the export, because the platform snaps don’t ship locale definitions anyway
  • prefix the export by "$LOCPATH:" , so if the snap uses a custom launcher that sets LOCPATH, that value will be preserved and honoured in priority
@didrocks

didrocks approved these changes Jan 30, 2017
View changes

Looks like exactly what we need! Thanks, merging it :)

@didrocks didrocks merged commit 98873de into Ubuntu:master Jan 30, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment