split aslo fetches into fructose, honey, pdfs, and other

1 files changed, 63 insertions, 24 deletions

diff --git a/soas-aslo-and-content.ks b/soas-aslo-and-content.ks
index c27dfee..a86c122 100644
--- a/soas-aslo-and-content.ks
+++ b/soas-aslo-and-content.ks
@@ -1,52 +1,91 @@
 
 %post --nochroot
 
-# download additional honey activities
-ASLO="$ASLO 4042" # InfoSlicer
+# activities.sugarlabs.org (ASLO) installed-packages
+
+# Fructose
+ASLO="$ASLO 4024" # browse
+ASLO="$ASLO 4027" # turtleart
+ASLO="$ASLO 4028" # read
+ASLO="$ASLO 4032" # imageviewer
+ASLO="$ASLO 4035" # read e-texts
+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 write" # write - missing from ASLO
+
+# Honey subset
+ASLO="$ASLO 4029" # IRC
 ASLO="$ASLO 4034" # Moon
+ASLO="$ASLO 4037" # CartoonBuilder
+ASLO="$ASLO 4038" # Speak
+ASLO="$ASLO 4039" # ViewSlides
+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 4058" # Develop
+ASLO="$ASLO 4059" # TamTamEdit
+ASLO="$ASLO 4060" # TamTamJam
+ASLO="$ASLO 4061" # TamTamMini
+ASLO="$ASLO 4062" # TamTamSynth Lab
 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 4071" # Maze
 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 4088" # Tux Paint
 ASLO="$ASLO 4089" # Library
-ASLO="$ASLO 4041" # Pippy
 ASLO="$ASLO 4193" # Physics
 
+
 WD=$PWD
 BUNDLES_DIR=$INSTALL_ROOT/usr/share/sugar/bundles
 
 mkdir -p $BUNDLES_DIR
 cd $BUNDLES_DIR
 
+CACHE_DIR=/var/tmp/soas-sugar/cache/aslo
+mkdir -p $CACHE_DIR
+
 for id in $ASLO ; do
-  curl -L http://activities.sugarlabs.org/en-US/sugar/downloads/latest/$id > $id.xo
+  url=http://activities.sugarlabs.org/en-US/sugar/downloads/latest/$id
+  remote_file=$(basename $(curl -4 -s -L -w %{url_effective} -I $url | tail -1))
+  bundle=$CACHE_DIR/$remote_file
+  if [ ! -f $bundle ] ; then
+     curl -4 -L $url > $bundle
+  fi
+  unzip -qq -d $BUNDLES_DIR $bundle
 done
 
-# get the script to install the activities
-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=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
+  url=http://dev.sugarlabs.org/raw-attachment/ticket/840/$pdf
+  remote_file=$(basename $(curl -4 -s -L -w %{url_effective} -I $url | tail -1))
+  bundle=$CACHE_DIR/$remote_file
+  if [ ! -f $bundle ] ; then
+     curl -4 -L $url > $bundle
+  fi
+  cp -p $bundle $BUNDLES_DIR
+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