Join GitHub today
GitHub is home to over 20 million developers working together to host and review code, manage projects, and build software together.
POSIX: Add $SNAP to search path if available. #795
Conversation
|
This should respect the prefix, and the snap path should be higher priority than the data path added by the superclass. I'll fix these shortly. I think it makes sense to keep the data path in the search path, to avoid breaking things if someone has $SNAP set to something random. That's easy enough to change too, though. |
sev-
reviewed
Jul 29, 2016
| @@ -141,6 +141,22 @@ Common::String OSystem_POSIX::getDefaultConfigFileName() { | ||
| return configFile; | ||
| } | ||
| +void OSystem_POSIX::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) { | ||
| + const char *snap = getenv("SNAP"); | ||
| + if (snap) { |
wjp
Jul 29, 2016
Owner
It should still call OSystem_SDL::addSysArchivesToSearchSet even when SNAP is not set.
|
Nice, merging. |
sev-
merged commit 45e82b5
into
scummvm:master
Aug 1, 2016
1 check passed
spads-spads
referenced this pull request
Aug 2, 2016
Merged
Add snapcraft.yaml so you can `snapcraft build` #800
|
@fuzzie, @spads-spads: Do you consider the snapcraft support to be stable enough to be mentioned in the Linux port section in our NEWS file? |
|
@rootfather It's stable enough that I've been able to build arbitrary revisions from git and play Beneath A Steel Sky on them. There's work to be done to tighten the access required, so we can snap up self-contained games with scummvm inside so they don't need external filesystem access. |
|
@spads-spads Thanks for your reply. If you don't have any objections, I'll mark the snapcraft support as "preliminary" or "basic" in the appropriate NEWS item until full functionality is achieved. |
|
Sounds good! |
fuzzie commentedJul 29, 2016
This allows ScummVM to find data files while running in a snap (e.g.
from the new Ubuntu store).