diff options
| author | Bert Freudenberg <bert@freudenbergs.de> | 2007-10-31 23:41:42 (GMT) |
|---|---|---|
| committer | Bert Freudenberg <bert@freudenbergs.de> | 2007-10-31 23:41:42 (GMT) |
| commit | cc9e8bfc54ab9154da76f36a31521e89c00dbbd6 (patch) | |
| tree | 3b4e51a49b7dd30ed24cc302fe192cd8788ab3cf /etoys-activity | |
| parent | 30fa896d788d8b4e9ddc35c33ad02028dfc0b17d (diff) | |
update to 1737, remove old/ directory in bundle
Diffstat (limited to 'etoys-activity')
| -rwxr-xr-x | etoys-activity | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/etoys-activity b/etoys-activity index 68d5710..dd43f6e 100755 --- a/etoys-activity +++ b/etoys-activity @@ -1,8 +1,11 @@ #!/bin/sh # Author: Bert Freudenberg -# Purpose: This version of etoys-activity is called only under -# new (post-Trial-3) Sugar. There is another one in the -# bundle's root directory called under old Sugar. +# Purpose: Run Etoys using the Squeak virtual machine +# +# This version of etoys-activity is called only under new Sugar +# (Joyride/Update.1). There is another one in the bundle's root +# directory called under old Sugar which was pre-installed on the +# first mass-produced machines (Trial-3/Ship.1). echo "$0" "$@" echo @@ -33,11 +36,12 @@ echo launching $bundle_id instance $activity_id [ -n "$uri" ] && echo loading uri $uri echo - +# sanitize [ -z "$SUGAR_PROFILE" ] && SUGAR_PROFILE=default -etoysdir="$HOME/.sugar/$SUGAR_PROFILE/etoys" -export SQUEAK_SECUREDIR="$etoysdir/private" -export SQUEAK_USERDIR="$etoysdir/sandbox" +[ -z "$SUGAR_ACTIVITY_ROOT" ] && SUGAR_ACTIVITY_ROOT="$HOME/.sugar/$SUGAR_PROFILE/etoys" + +export SQUEAK_SECUREDIR="$SUGAR_ACTIVITY_ROOT/private" +export SQUEAK_USERDIR="$SUGAR_ACTIVITY_ROOT/sandbox" # now run Squeak VM with Etoys image exec etoys \ |