Author: Paul_R
Date: 2008-09-11 16:02:41 +0200 (Thu, 11 Sep 2008)
New Revision: 1840
Added:
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/launcher/
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/launcher/share/
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/launcher/share/applications/
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/launcher/share/applications/controlcenter.desktop
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/launcher/share/applications/updater.desktop
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/launcher/share/pixmaps/
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/launcher/share/pixmaps/tuxcc.png
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/launcher/share/pixmaps/tuxupd.png
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/updater/
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/updater/tux_updater
Modified:
software_suite_v2/tuxware/installers/unix/trunk/build.sh
Log:
* Added launcher on the menus
* Added the gadget_updater script
* small cleanup
Modified: software_suite_v2/tuxware/installers/unix/trunk/build.sh
===================================================================
--- software_suite_v2/tuxware/installers/unix/trunk/build.sh 2008-09-11
09:41:14 UTC (rev 1839)
+++ software_suite_v2/tuxware/installers/unix/trunk/build.sh 2008-09-11
14:02:41 UTC (rev 1840)
@@ -27,6 +27,7 @@
mkdir build/opt/tuxdroid/controlcenter
mkdir build/opt/tuxdroid/python_api
mkdir build/opt/tuxdroid/firmware
+ mkdir build/opt/tuxdroid/misc
}
packServer () {
@@ -106,6 +107,11 @@
cp -r build_deps/common/cc_deps/* build/opt/tuxdroid/controlcenter/
}
+packUpdater () {
+ echo -- Copying the gadget updater
+ cp -r build_deps/common/updater/tux_updater build/opt/tuxdroid/misc
+}
+
serverBin () {
echo -- Creating server binary
echo "#!/bin/bash" >build/opt/tuxdroid/bin/tuxhttpserver
@@ -122,6 +128,14 @@
chmod +x build/opt/tuxdroid/bin/tux_control_center
}
+updaterBin () {
+ echo -- Creating control center binary
+ echo "#!/bin/bash" >build/opt/tuxdroid/bin/tux_updater
+ echo "source /opt/tuxdroid/misc/tux_updater" |tee -a \
+ build/opt/tuxdroid/bin/tux_updater >/dev/null
+ chmod +x build/opt/tuxdroid/bin/tux_updater
+}
+
createUsrDir () {
echo Creating /usr directory
mkdir build/usr
@@ -134,6 +148,9 @@
>/dev/null
ln -s /opt/tuxdroid/bin/dfu-programmer build/usr/bin/dfu-programmer \
>/dev/null
+ ln -s /opt/tuxdroid/bin/tux_updater build/usr/bin/tux_updater \
+ >/dev/null
+ cp -rf build_deps/common/launcher/* build/usr/
}
@@ -150,7 +167,6 @@
echo "Priority: extra" |tee -a $CONTROL >/dev/null
echo "Section: Application" |tee -a $CONTROL >/dev/null
SIZE=`du -s build |awk '{print $1}'`
- echo $SIZE
echo "Installed-Size: $SIZE" |tee -a $CONTROL >/dev/null
echo "Maintainer: KySoH <[EMAIL PROTECTED]>" |tee -a $CONTROL >/dev/null
echo "Architecture: i386" |tee -a $CONTROL >/dev/null
@@ -293,8 +309,10 @@
packFirmwares
packShared
packCCDeps
+packUpdater
serverBin
ccBin
+updaterBin
createUsrDir
case $TYPE in
Added:
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/launcher/share/applications/controlcenter.desktop
===================================================================
---
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/launcher/share/applications/controlcenter.desktop
(rev 0)
+++
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/launcher/share/applications/controlcenter.desktop
2008-09-11 14:02:41 UTC (rev 1840)
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Version=0.1
+Encoding=UTF-8
+Name=Tux Control Center
+Comment=KySoH "http://www.kysoh.com";
+Exec=tux_control_center
+Icon=tuxcc.png
+Terminal=false
+Type=Application
+Categories=Application;Utility;
+StartupNotify=true
+GenericName[fr]=TuxDroid - Centre de contrôle
+GenericName[en]=TuxDroid - Control Center
+GenericName[nl]=TuxDroid - Control Center
Property changes on:
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/launcher/share/applications/controlcenter.desktop
___________________________________________________________________
Name: svn:executable
+ *
Added:
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/launcher/share/applications/updater.desktop
===================================================================
---
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/launcher/share/applications/updater.desktop
(rev 0)
+++
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/launcher/share/applications/updater.desktop
2008-09-11 14:02:41 UTC (rev 1840)
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Version=0.1
+Encoding=UTF-8
+Name=Tux Droid software updater
+Comment=KySoH "http://www.kysoh.com";
+Exec=tux_updater
+Icon=tuxupd.png
+Terminal=true
+Type=Application
+Categories=Application;Utility;
+StartupNotify=true
+GenericName[fr]=Tux Droid - mise à jour
+GenericName[en]=Tux Droid software updater
+GenericName[nl]=Tux Droid software updater
Property changes on:
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/launcher/share/applications/updater.desktop
___________________________________________________________________
Name: svn:executable
+ *
Added:
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/launcher/share/pixmaps/tuxcc.png
===================================================================
(Binary files differ)
Property changes on:
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/launcher/share/pixmaps/tuxcc.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/launcher/share/pixmaps/tuxupd.png
===================================================================
(Binary files differ)
Property changes on:
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/launcher/share/pixmaps/tuxupd.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/updater/tux_updater
===================================================================
---
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/updater/tux_updater
(rev 0)
+++
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/updater/tux_updater
2008-09-11 14:02:41 UTC (rev 1840)
@@ -0,0 +1,256 @@
+#!/bin/bash
+
+##
+# Constants and links
+##
+VERSION=0.0.1
+STATE=Beta
+
+DONE="\033[80D\033[72C[\033[32m DONE \033[00m]\n"
+BUSY="\033[80D\033[72C[\033[33m BUSY \033[00m]"
+
+## URLs
+KYSOH_URL=http://www.kysoh.com/download
+INST_DIR=installers/unix32
+DEP_DIR=$INST_DIR/deps
+APP_DIR=applications
+GADGET_DIR=gadgets
+RES_DIR=resources
+
+CONTROL_CENTER_URL=$KYSOH_URL/$APP_DIR/linux/control_center
+JRE_URL=$KYSOH_URL/$INST_DIR/java_jre
+GADGET_URL=$KYSOH_URL/$GADGET_DIR
+TOOLS_URL=$KYSOH_URL/$INST_DIR/tools
+
+##
+# Display the header
+##
+disp_header () {
+ printf "\033[H\033[J"
+ echo ---------------------------------------------------------------------\
+-----------
+ echo TuxDroid V2 software installer
+ echo 2008 - KYSOH
+ echo v$VERSION $STATE
+ echo ---------------------------------------------------------------------\
+-----------
+}
+
+##
+# Display the footer after a gadget update
+##
+dspUpdFooter () {
+ echo
+ echo ---------------------------------------------------------------------\
+-----------
+echo Update finished
+ echo ---------------------------------------------------------------------\
+-----------
+}
+
+#------------------------------------------------------------------------------
+
+##
+# Create a temporary directory
+##
+createTemp () {
+ cd /tmp
+ mkdir -p inst_tmp
+ cd inst_tmp
+}
+
+##
+# Delete the temporary directory
+##
+clearTemp () {
+ cd $OPDIR
+ rm -rf /tmp/inst_tmp
+}
+
+##
+# Remove "index.html" file presents after the function wget -r -l x
+##
+remove_index () {
+ find $1 -name "index.html">filelist
+ for i in `cat filelist`
+ do
+ rm "$i"
+ done
+ rm filelist
+}
+
+##
+# Install files from an URL
+##
+installFile () {
+ wget -q $1/version.txt
+
+ FILE=`cat version.txt`
+ wget -q $1/$FILE
+ tar -xf $FILE
+ DIR=`sed s/.tar.gz//g version.txt`
+
+ cd $DIR
+ source install.sh
+ cd - >/dev/null
+
+ rm version.txt
+ rm -rf $DIR
+ rm $FILE
+}
+
+##
+# Download the ControlCenter from Kysoh ftp
+##
+downloadControlCenter () {
+ printf "Downloading Control Center $BUSY"
+
+ wget -q $CONTROL_CENTER_URL/version.txt
+ FILE=`cat version.txt`
+ wget -q $CONTROL_CENTER_URL/$FILE
+ chmod +x $FILE
+ $GKSU -u root mv $FILE $CONTROL_CENTER_DIR/controlcenter.jar
+ rm version.txt
+
+ printf "$DONE"
+}
+
+testJre () {
+ # Test if java is installed, and store the version string
+ java -version 2>version>version
+ if [ $? != 0 ]
+ then
+ installJre
+ fi
+
+ # Parse the version string to know the version of the current version
+ # of the JRE.
+ VER=`cat version |grep java |cut -f 2 -d'"' |cut -f 2 -d "."` 1>/dev/null
+ if [ $VER -lt 6 ]
+ then
+ installJre
+ fi
+}
+
+# Download and install the JRE v1.6
+installJre () {
+ printf "Downloading JRE $BUSY"
+ wget -q $JRE_URL/version.txt
+ FILE=`cat version.txt`
+ wget -q $JRE_URL/$FILE
+ printf "$DONE"
+ chmod +x $FILE
+ echo Installing JRE
+ echo You have to accept the license.
+ ./$FILE
+ rm $FILE
+ rm version.txt
+ cp -r jre* /opt/
+ ln -sf /opt/jre*/bin/* $BIN_DIR/
+ printf "$DONE"
+}
+##
+# Update gadget - main function
+##
+updateUserDirectory () {
+ echo ''
+ createTemp
+ downloadControlCenter
+ isUserDirectory
+ updateGadgets
+ updateLinuxGadgets
+ updateTools
+ clearTemp
+}
+
+##
+# Verify if $HOME/MyTux already exist
+##
+isUserDirectory () {
+ if [ ! -d $HOME/MyTux ]
+ then
+ mkdir $HOME/MyTux
+ mkdir $HOME/MyTux/MyTuxAttitunes
+ mkdir $HOME/MyTux/MyTuxGadgets
+ mkdir $HOME/MyTux/MyTuxTools
+ mkdir $HOME/MyTux/TuxDroidSettings
+ fi
+}
+
+##
+# Update the gadgets
+##
+updateGadgets () {
+ printf "Updating gadgets $BUSY"
+ wget -q -r -l 2 $GADGET_URL/common
+ remove_index www.kysoh.com
+
+ # Copy the TGF files
+ find www.kysoh.com -name "version.txt">filelist
+ for i in `cat filelist`
+ do
+ FILE=`cat $i`
+ echo $i >temp
+ URL=`sed s/version.txt//g temp`
+ rm temp
+ wget -q $FILE
+ cp $URL$FILE $HOME/MyTux/MyTuxGadgets
+ done
+
+ rm filelist
+ rm -rf www.kysoh.com
+
+ printf "$DONE"
+}
+
+updateLinuxGadgets () {
+ printf "Updating linux gadgets $BUSY"
+ wget -q -r -l 2 $GADGET_URL/linux
+ remove_index www.kysoh.com
+
+ # Copy the TGF files
+ find www.kysoh.com -name "version.txt">filelist
+ for i in `cat filelist`
+ do
+ FILE=`cat $i`
+ echo $i >temp
+ URL=`sed s/version.txt//g temp`
+ rm temp
+ wget -q $FILE
+ cp $URL$FILE $HOME/MyTux/MyTuxGadgets
+ done
+
+ rm filelist
+ rm -rf www.kysoh.com
+
+ printf "$DONE"
+}
+
+##
+# Update the tools
+##
+updateTools () {
+ printf "Updating tools $BUSY"
+ installFile $TOOLS_URL
+ printf "$DONE"
+}
+
+############################### MAIN FUNCTION
###############################
+disp_header
+OPDIR=`pwd`
+gksu -v 2>/dev/null>/dev/null
+if [ $? != 127 ]; then
+ GKSU=gksu
+else
+ kdesu -v 2>/dev/null>/dev/null
+ if [ $? != 127 ]; then
+ GKSU=kdesu
+ else
+ echo kdesu or gksu not found. Quit.
+ exit 0
+ fi
+fi
+
+updateUserDirectory
+dspUpdFooter
+
Property changes on:
software_suite_v2/tuxware/installers/unix/trunk/build_deps/common/updater/tux_updater
___________________________________________________________________
Name: svn:executable
+ *
-------------------------------------------------------------------------
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
