diff options
| author | Aleksey Lim <alsroot@sugarlabs.org> | 2011-11-02 18:47:48 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@sugarlabs.org> | 2011-11-02 18:47:48 (GMT) |
| commit | e2f9e8dc3e57825b392b6cc07acc8f79557e1069 (patch) | |
| tree | 17193252adcaca4ea019944a26a2b1e6011834c1 | |
| parent | 7d96de028de51b77a4de667e79b8b5107f8adff2 (diff) | |
Workaround Sugar's PYTHONPATH setting behaviour #3224
| -rwxr-xr-x | activity/activity | 8 | ||||
| -rw-r--r-- | activity/activity.info | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/activity/activity b/activity/activity new file mode 100755 index 0000000..cda36e8 --- /dev/null +++ b/activity/activity @@ -0,0 +1,8 @@ +#!/bin/sh + +# Sugar is adding SUGAR_BUNDLE_PATH to the end of PYTHONPATH. +# Thus, on any filename colisions with system-wide files, +# activity code will be overriden. To prevent this behaviour, +# will change PYTHONPATH ourselves. +export PYTHONPATH=$SUGAR_BUNDLE_PATH:$PYTHONPATH +exec sugar-activity "$@" diff --git a/activity/activity.info b/activity/activity.info index bf240b2..fd3de57 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -4,7 +4,6 @@ activity_version = 18 service_name = org.worldwideworkshop.olpc.storybuilder bundle_id = org.worldwideworkshop.olpc.storybuilder icon = activity-storybuilder -class = activity.StoryBuilderActivity -exec = sugar-activity activity.StoryBuilderActivity +exec = activity/activity activity.StoryBuilderActivity show_launcher = yes license = GPLv2+ |