major change: pull activities from a.sl.o

1 files changed, 41 insertions, 31 deletions

diff --git a/soas-sugar.ks b/soas-sugar.ks
index cff4ecc..07e4a02 100644
--- a/soas-sugar.ks
+++ b/soas-sugar.ks
@@ -5,18 +5,7 @@ repo --name=sugar --baseurl=http://download.sugarlabs.org/soas/repositories/3/
 %packages
 
 # sugar!
-# temporary changes until comps group gets fixed
 sugar
-sugar-browse
-sugar-calculator
-sugar-chat
-sugar-imageviewer
-sugar-jukebox
-sugar-log
-sugar-read
-sugar-terminal
-sugar-turtleart
-sugar-write
 
 # additional packages
 DeviceKit-disks
@@ -72,28 +61,45 @@ gstreamer-plugins-espeak
 
 %post --nochroot
 
-# download additional honey activities
-ASLO="$ASLO 4042" # InfoSlicer
+# Fructose Collection
+ASLO="$ASLO 4024" # Browse
+ASLO="$ASLO 4027" # Turtle Art
+ASLO="$ASLO 4028" # Read
+ASLO="$ASLO 4032" # Imageviewer
+ASLO="$ASLO 4041" # Pippy
+ASLO="$ASLO 4043" # Terminal
+ASLO="$ASLO 4045" # Jukebox
+ASLO="$ASLO 4056" # Log
+ASLO="$ASLO 4069" # Chat
+ASLO="$ASLO 4076" # Calculator
+ASLO="$ASLO 4201" # Write
+
+# Honey Selection
+ASLO="$ASLO 4029" # IRC
 ASLO="$ASLO 4034" # Moon
+ASLO="$ASLO 4035" # Read ETexts 
+ASLO="$ASLO 4037" # CartoonBuilder
+ASLO="$ASLO 4038" # Speak
+ASLO="$ASLO 4039" # ViewSlides
+ASLO="$ASLO 4041" # Pippy
+ASLO="$ASLO 4042" # InfoSlicer
+ASLO="$ASLO 4044" # FlipSticks
 ASLO="$ASLO 4046" # JigsawPuzzle
 ASLO="$ASLO 4047" # SliderPuzzle
+ASLO="$ASLO 4050" # Colors
+ASLO="$ASLO 4054" # FreeCell
 ASLO="$ASLO 4063" # Memorize
-ASLO="$ASLO 4038" # Speak
-ASLO="$ASLO 4037" # CartoonBuilder
-ASLO="$ASLO 4044" # FlipSticks
 ASLO="$ASLO 4064" # JokeMachine
-ASLO="$ASLO 4029" # IRC
-ASLO="$ASLO 4054" # FreeCell
-ASLO="$ASLO 4039" # ViewSlides
 ASLO="$ASLO 4073" # StoryBuilder
 ASLO="$ASLO 4074" # Poll
 ASLO="$ASLO 4078" # Labyrinth
-ASLO="$ASLO 4082" # Paint
 ASLO="$ASLO 4081" # Record
-ASLO="$ASLO 4050" # Colors
+ASLO="$ASLO 4082" # Paint
 ASLO="$ASLO 4089" # Library
-ASLO="$ASLO 4041" # Pippy
+ASLO="$ASLO 4191" # Clock
 ASLO="$ASLO 4193" # Physics
+ASLO="$ASLO 4194" # Get Internet Archive Books
+ASLO="$ASLO 4203" # Update
 
 WD=$PWD
 BUNDLES_DIR=$INSTALL_ROOT/usr/share/sugar/bundles
@@ -109,15 +115,19 @@ done
 curl -O http://git.sugarlabs.org/projects/soas/repos/mainline/blobs/raw/2d1057e6d8e74aecfa82c0b8e51a2c8d772a7923/install-activity.py
 
 # pull sample content for the journal
-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
+PDFS="$PDFS south_america.pdf"
+PDFS="$PDFS africa.pdf"
+PDFS="$PDFS asia.pdf"
+PDFS="$PDFS central_america.pdf"
+PDFS="$PDFS europe.pdf"
+PDFS="$PDFS middle_east.pdf"
+PDFS="$PDFS north_america.pdf"
+PDFS="$PDFS oceania.pdf"
+PDFS="$PDFS southeast_asia.pdf"
+
+for pdf in $PDFS ; do
+  curl -O http://dev.sugarlabs.org/raw-attachment/ticket/840/$pdf
+done
 
 # get sample content setup script directly from git
 curl -O http://git.sugarlabs.org/projects/soas/repos/mainline/blobs/raw/8ad00566985860f9891aea714c74e5430e9c395d/copy-to-datastore.py