Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/soas-sugar.ks
diff options
context:
space:
mode:
Diffstat (limited to 'soas-sugar.ks')
-rw-r--r--soas-sugar.ks47
1 files changed, 21 insertions, 26 deletions
diff --git a/soas-sugar.ks b/soas-sugar.ks
index 5bde479..d124176 100644
--- a/soas-sugar.ks
+++ b/soas-sugar.ks
@@ -93,7 +93,7 @@ ASLO="$ASLO 4050" # Colors
ASLO="$ASLO 4089" # Library
WD=$PWD
-BUNDLES_DIR=$INSTALL_ROOT/usr/share/sugar/honey
+BUNDLES_DIR=$INSTALL_ROOT/home/liveuser/Activities
mkdir -p $BUNDLES_DIR
cd $BUNDLES_DIR
@@ -102,20 +102,30 @@ for id in $ASLO ; do
curl -L http://activities.sugarlabs.org/en-US/sugar/downloads/latest/$id > $id.xo
done
+for file in *.xo ; do
+ unzip $file
+ rm $file
+done
+
# pull sample content for the journal
-curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/south_america.pdf > south_america.pdf
-curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/africa.pdf > africa.pdf
-curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/asia.pdf > asia.pdf
-curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/central_america.pdf > central_america.pdf
-curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/europe.pdf > europe.pdf
-curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/middle_east.pdf > middle_east.pdf
-curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/north_america.pdf > north_america.pdf
-curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/oceania.pdf > oceania.pdf
-curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/southeast_asia.pdf > southeast_asia.pdf
+curl -O http://dev.sugarlabs.org/raw-attachment/ticket/840/south_america.pdf
+curl -O http://dev.sugarlabs.org/raw-attachment/ticket/840/africa.pdf
+curl -O http://dev.sugarlabs.org/raw-attachment/ticket/840/asia.pdf
+curl -O http://dev.sugarlabs.org/raw-attachment/ticket/840/central_america.pdf
+curl -O http://dev.sugarlabs.org/raw-attachment/ticket/840/europe.pdf
+curl -O http://dev.sugarlabs.org/raw-attachment/ticket/840/middle_east.pdf
+curl -O http://dev.sugarlabs.org/raw-attachment/ticket/840/north_america.pdf
+curl -O http://dev.sugarlabs.org/raw-attachment/ticket/840/oceania.pdf
+curl -O http://dev.sugarlabs.org/raw-attachment/ticket/840/southeast_asia.pdf
# get sample content setup script directly from git
-curl -L http://git.sugarlabs.org/projects/soas/repos/mainline/blobs/raw/fe5fb6016208193de184988d895c3d01c55f231e/sample-content.sh > sample-content.sh
+curl -O http://git.sugarlabs.org/projects/soas/repos/mainline/blobs/raw/8ad00566985860f9891aea714c74e5430e9c395d/copy-to-datastore.py
+# execute script and clean up afterwards
+su liveuser -c ./copy-to-datastore.py
+rm -f *.pdf
+
+chown -R 500:500 $BUNDLES_DIR
cd $WD
%end
@@ -183,10 +193,6 @@ chown liveuser:liveuser /home/liveuser/.Xclients
# disable the logout menu item in Sugar
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/show_logout false >/dev/null
-# setup activity directory
-mkdir -p /home/liveuser/Activities
-chown liveuser:liveuser /home/liveuser/Activities
-
# add more activities to the favorites
cat > /usr/share/sugar/data/activities.defaults << FOE
com.garycmartin.Moon
@@ -209,17 +215,6 @@ vu.lux.olpc.Speak
org.worldwideworkshop.olpc.JigsawPuzzle
FOE
-# switch to honey directory and install activities
-cd /usr/share/sugar/honey
-
-su liveuser -c 'sugar-install-bundle *.xo'
-rm -f *.xo
-
-# execute script and clean up afterwards
-chmod a+x sample-content.sh
-su liveuser -c ./sample-content.sh
-rm -f sample-content.sh
-
EOF
%end