fix activity/content pre-/post-installation steps

1 files changed, 3 insertions, 4 deletions

diff --git a/soas-xo.ks b/soas-xo.ks
index 1844251..8ca8222 100644
--- a/soas-xo.ks
+++ b/soas-xo.ks
@@ -8,6 +8,7 @@ repo --name=olpc --cost=3 --baseurl=http://dev.laptop.org/~dsd/xo1.5-rpms
 
 bootchart
 fbida
+
 ntpdate
 ohm
 xcompmgr
@@ -154,20 +155,18 @@ BUNDLES_DIR=/usr/share/sugar/bundles
 ACTIVITIES_DIR=/home/$CREATE_USERNAME/Activities
 chown -R $CREATE_USERNAME:$CREATE_USERNAME $BUNDLES_DIR
 mkdir /home/$CREATE_USERNAME/Activities
-for activity_dir in $BUNDLES_DIR/* ; do
-    ln -s $activity_dir $ACTIVITIES_DIR
-done
 chown -R $CREATE_USERNAME:$CREATE_USERNAME $ACTIVITIES_DIR
 cd $BUNDLES_DIR
 chmod a+x install-activity.py
 for file in *.xo; do
     su $CREATE_USERNAME -c "./install-activity.py $file"
 done
+rm -f install-activity.py
 
 # execute sample content script and clean up afterwards
 chmod a+x copy-to-datastore.py
 su $CREATE_USERNAME -c ./copy-to-datastore.py
-rm -f *.pdf
+rm -f *.pdf copy-to-datastore.py
 
 
 # END avoid livesys scripts at every boot