diff options
| author | Martin Dengler <martin@martindengler.com> | 2009-06-20 03:31:07 (GMT) |
|---|---|---|
| committer | Martin Dengler <martin@martindengler.com> | 2009-06-20 04:02:08 (GMT) |
| commit | e249c1c13e16d1ba6c2c8e9bacea59348c64c040 (patch) | |
| tree | 7ba27f8b2bd017a91a97c7c41ccba6b4af76fee4 | |
| parent | 25fbe31d967f8408f1c7fed55011a66f134338a7 (diff) | |
deal with ASLO lying about how old .xo bundles are
Conflicts:
soas-sugar.ks
| -rw-r--r-- | soas-sugar.ks | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/soas-sugar.ks b/soas-sugar.ks index 1bc43c8..b7de15e 100644 --- a/soas-sugar.ks +++ b/soas-sugar.ks @@ -200,29 +200,22 @@ ASLO="$ASLO 4089" # Library -CACHE_DIR=/var/tmp/soas-sugar/cache/aslo -mkdir -p $CACHE_DIR HONEY_DIR=usr/share/sugar/honey BUNDLES_DIR=${INSTALL_ROOT}/${HONEY_DIR} mkdir -p $BUNDLES_DIR chown $CREATE_USER:$CREATE_USER $BUNDLES_DIR +CACHE_DIR=/var/tmp/soas-sugar/cache/aslo +mkdir -p $CACHE_DIR + for id in $ASLO ; do - bundle=$CACHE_DIR/$id.xo - timeargs="" - if [ -e $bundle ] ; then - timeargs="-z $bundle" + url=http://activities.sugarlabs.org/en-US/sugar/downloads/latest/$id + remote_file=$(basename $(curl -s -L -w %{url_effective} -I $url | tail -1)) + bundle=$CACHE_DIR/$remote_file + if [ ! -f $bundle ] ; then + curl -L $url > $bundle fi - curl $timeargs -L http://activities.sugarlabs.org/en-US/sugar/downloads/latest/$id > $bundle - unzip -d $BUNDLES_DIR $bundle -done - -pushd $INSTALL_ROOT -for homedir in /home/*/Activities ; do - for activity_dir in $HONEY_DIR/* ; do - ln -s $activity_dir $homedir - done + unzip -qq -d $BUNDLES_DIR $bundle done -popd %end |