Author: ks156 Date: 2008-12-01 11:50:25 +0100 (Mon, 01 Dec 2008) New Revision: 2954
Modified: software_suite_v2/tuxware/installers/unix/branches/prefix_install/build.sh Log: * Cleanup and reorganized the installation Modified: software_suite_v2/tuxware/installers/unix/branches/prefix_install/build.sh =================================================================== --- software_suite_v2/tuxware/installers/unix/branches/prefix_install/build.sh 2008-12-01 10:45:25 UTC (rev 2953) +++ software_suite_v2/tuxware/installers/unix/branches/prefix_install/build.sh 2008-12-01 10:50:25 UTC (rev 2954) @@ -19,6 +19,7 @@ GADGET_URL=$KYSOH_URL/gadgets TOOLS_URL=$KYSOH_URL/tools TEMPLATES_URL=$KYSOH_URL/resources/templates +SKIN_URL=$KYSOH_URL/resources/skins #ATT_URL=$KYSOH_URL/$INST_DIR/attitunes #SKIN_URL=http://www.kysoh.com/download/resources/skin TMP_RULES_FILE=/tmp/tuxtmp @@ -190,10 +191,9 @@ |grep "Last Changed Rev" |cut -f 2 -d ":"` echo " trunk at rev : $SVN_REV " >> $MIRROR_DIR/$PREFIX/$VER_FILE fi - svn export --force \ + svn export -q --force \ http://svn.tuxisalive.com/software_suite_v2/tuxware/tuxhttpserver/$__URL/src \ $TEMP_DIR/tuxhttpserver - rm $TEMP_DIR/tuxhttpserver/*.bat rm $TEMP_DIR/tuxhttpserver/*.exe rm $TEMP_DIR/tuxhttpserver/installer.* cp -r $TEMP_DIR/tuxhttpserver/* $MIRROR_DIR/$PREFIX/$SERVER_DIR @@ -212,10 +212,9 @@ |grep "Last Changed Rev" |cut -f 2 -d ":"` echo " trunk at rev :$SVN_REV " >> $MIRROR_DIR/$PREFIX/$VER_FILE fi - svn export --force \ + svn export -q --force \ http://svn.tuxisalive.com/software_suite_v2/tuxware/pytuxisalive/$__URL/src/ \ $TEMP_DIR/python_api - rm $TEMP_DIR/python_api/*.bat rm $TEMP_DIR/python_api/installer* rm $TEMP_DIR/python_api/*.ico cp $TEMP_DIR/python_api/tuxisalive/api/sh.py $MIRROR_DIR/$PREFIX/$MISC_DIR @@ -235,7 +234,7 @@ |grep "Last Changed Rev" |cut -f 2 -d ":"` echo " trunk at rev :$SVN_REV " >> $MIRROR_DIR/$PREFIX/$VER_FILE fi - svn export --force \ + svn export -q --force \ http://svn.tuxisalive.com/software_suite_v2/tuxware/java-api/$__URL/src/ \ $TEMP_DIR/java_api cp -r $TEMP_DIR/java_api/* $MIRROR_DIR/$PREFIX/$LIB_JAVA_API @@ -243,7 +242,7 @@ # Compile the driver from SVN compileDriver () { - svn export --force \ + svn export -q --force \ http://svn.tuxisalive.com/software_suite_v2/tuxware/tuxdriver/trunk /tmp/tuxdriver cd /tmp/tuxdriver/unix make @@ -265,7 +264,7 @@ |grep "Last Changed Rev" |cut -f 2 -d ":"` echo " trunk at rev :$SVN_REV " >> $MIRROR_DIR/$PREFIX/$VER_FILE fi - svn export --force \ + svn export -q --force \ http://svn.tuxisalive.com/firmware/tuxup/unix/$__URL \ $TEMP_DIR/tuxup cd $TEMP_DIR/tuxup @@ -281,7 +280,7 @@ echo "-- Packing firmwares" echo "Firmwares version : " >> $MIRROR_DIR/$PREFIX/$VER_FILE listServer http://svn.tuxisalive.com/firmware/hex - svn export --force \ + svn export -q --force \ http://svn.tuxisalive.com/firmware/hex/$__URL \ $TEMP_DIR/firmware cp $TEMP_DIR/firmware/* $MIRROR_DIR/$PREFIX/$FIRMWARE_DIR @@ -291,7 +290,7 @@ wifiAvoidance () { echo "-- Compiling the wifi avoidance software" mkdir tmp - svn export --force \ + svn export -q --force \ http://svn.tuxisalive.com/software_suite_v2/software/tux_wifi_channel/trunk tmp cd tmp make -f Makefile.unix @@ -304,7 +303,7 @@ packIdleBehavior () { echo "Packing Idle Behavior" mkdir /tmp/idle_behavior - svn export --force \ + svn export -q --force \ http://svn.tuxisalive.com/software_suite_v2/software/http_server_resources/idle_behavior/trunk /tmp/idle_behavior cp /tmp/idle_behavior/ResourceTuxIdle.py $MIRROR_DIR/$PREFIX/$SERVER_DIR/resources mkdir $MIRROR_DIR/$PREFIX/$ATTITUNES_DIR/idleBehaviors @@ -371,35 +370,33 @@ } installFromFtp () { + echo Downloading : $url + # Retrieve the filename from the PATH + file=${path##*/} + # Substract the filename to the path + path=${path%%$file} + if [ ! -d $MIRROR_DIR/$path ]; then + mkdir -p $MIRROR_DIR/$path + fi + wget -q $url -O $MIRROR_DIR/$path/$file +} + +retrieveFiles () { + python getRules.py $VERSION_TYPE LINUX $1 $TMP_RULES_FILE + # Remplace all | by ; to avoid pipelining + sed 's/|/;/g' $TMP_RULES_FILE > /tmp/tuxtmp1 while read line; do # sed : # I have to replace $PREFIX (ascii sequence) by the environment # variable. echo $line|cut -d ';' -f 3 |sed "s/\$PREFIX/\\${PREFIX}/g" >path path=`cat path` - echo $path rm path echo $line|cut -d ';' -f 4 |sed "s/\$PREFIX/\\${PREFIX}/g" >url url=`cat url` rm url - # Retrieve the filename from the PATH - file=${path##*/} - # Substract the filename to the path - path=${path%%$file} - if [ ! -d $MIRROR_DIR/$path ]; then - mkdir -p $MIRROR_DIR/$path - fi - wget -q $url -O $MIRROR_DIR/$path/$file - + installFromFtp done < /tmp/tuxtmp1 -} - -retrieveFiles () { - python getRules.py $VERSION_TYPE LINUX $1 $TMP_RULES_FILE - echo $? - # Remplace all | by ; to avoid pipelining - sed 's/|/;/g' $TMP_RULES_FILE > /tmp/tuxtmp1 - installFromFtp rm /tmp/tuxtmp1 $TMP_RULES_FILE } @@ -408,6 +405,7 @@ retrieveFiles $GADGET_URL retrieveFiles $TOOLS_URL retrieveFiles $TEMPLATES_URL + retrieveFiles $SKIN_URL } # Create the updater binary @@ -567,7 +565,7 @@ mkdir tuxsetup-$VERSION mv $BUILD_DIR/* tuxsetup-$VERSION rmSVN - tar -czvf tuxsetup-$VERSION.tar.gz tuxsetup-$VERSION + tar -czf tuxsetup-$VERSION.tar.gz tuxsetup-$VERSION rm -rf $BUILD_DIR $TEMP_DIR tuxsetup-$VERSION } ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ Tux-droid-svn mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
