[tuxdroid-svn] r4709 - in software_suite_v2/tuxware/installers/unix/trunk: . build_deps/deb

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-05-29 15:29:53 +0200 (Fri, 29 May 2009)
New Revision: 4709

Modified:
   software_suite_v2/tuxware/installers/unix/trunk/build.sh
   software_suite_v2/tuxware/installers/unix/trunk/build_deps/deb/postinst
Log:
* Fixed the libasound install
  -> tested with ubuntu 9.04 32 bits
* Clean the files when the debian package is uninstalled


Modified: software_suite_v2/tuxware/installers/unix/trunk/build.sh
===================================================================
--- software_suite_v2/tuxware/installers/unix/trunk/build.sh	2009-05-29 12:42:42 UTC (rev 4708)
+++ software_suite_v2/tuxware/installers/unix/trunk/build.sh	2009-05-29 13:29:53 UTC (rev 4709)
@@ -205,14 +205,14 @@
 # Include Python32
 packPython32 () {
     echo "-- Copying python for 32 bits "
-    mkdir $MIRROR_DIR/tmp
+    mkdir -p $MIRROR_DIR/tmp
     wget http://ftp.kysoh.com/apps/x86_64_compat/python2.6.2/Python32.tar.gz -O \
     $MIRROR_DIR/tmp/Python32.tar.gz
 }
 
 packAlsalib32 () {
     echo "-- Copying alsa-lib 1.0.20 for 32 bits "
-    mkdir -p $MIRROR_DIR/usr/local/
+    mkdir -p $MIRROR_DIR/tmp
     wget http://ftp.kysoh.com/apps/x86_64_compat/alsa-lib1.0.20/alsa-lib1.0.20.tar.gz -O \
     $MIRROR_DIR/tmp/alsalib.tar.gz
 }
@@ -386,7 +386,7 @@
     echo "-- Creating server binary"
     echo "#!/bin/bash" >$MIRROR_DIR/$PREFIX/$BIN_DIR/tuxhttpserver
     echo "export LD_LIBRARY_PATH=/usr/local/lib" >> \
-        >> $MIRROR_DIR/$PREFIX/$BIN_DIR/tuxhttpserver
+        $MIRROR_DIR/$PREFIX/$BIN_DIR/tuxhttpserver
     if [ $ARCH == "amd64" ]; then
 	echo "/opt/Python32/bin/python2.6 $PREFIX/$SERVER_DIR/tuxhttpserver.py" >> \
 	$MIRROR_DIR/$PREFIX/$BIN_DIR/tuxhttpserver 
@@ -439,7 +439,6 @@
     if [ ! -d $MIRROR_DIR/$path ]; then
         mkdir -p $MIRROR_DIR/$path
     fi
-    echo $url
     wget -q $url -O $MIRROR_DIR/$path/$file
 }
 
@@ -456,7 +455,6 @@
         rm path
         echo $line|cut -d ';' -f 4 |sed "s;\$PREFIX;\\${PREFIX};g" >url
         url=`cat url`
-        echo $url
         rm url
         if [ `echo $line|cut -d ';' -f 1` == COPY ]; then
             installFromFtp
@@ -488,7 +486,6 @@
 createDebianDir () {
     echo "Creating debian directory"
     mkdir $BUILD_DIR/DEBIAN
-    echo "" >$BUILD_DIR/DEBIAN/conffiles
 }
 
 packDebInitScript () {
@@ -517,15 +514,16 @@
 
 createPreRmDeb () {
     echo "Creating pre remove script"
-    echo '/etc/init.d/tuxhttpserver stop
-    rm -r /opt/Python32
-    rm -r /etc/tuxdroid
-    for file in `find /usr/share/tuxdroid -iname "*.py[co]"`; do
-        rm $file
-    done
-    for file in `find /usr/lib/tuxdroid -iname "*.py[co]"`; do
-        rm $file
-    done' > $PRERM
+    echo '#!/bin/bash
+/etc/init.d/tuxhttpserver stop
+[[ -d /opt/Python32 ]] && rm -r /opt/Python32
+for file in `find /usr/share/tuxdroid -iname "*.py[co]"`; do
+    rm $file
+done
+for file in `find /usr/lib/tuxdroid -iname "*.py[co]"`; do
+    rm $file
+done' > $PRERM
+    chmod +x $PRERM
 }
 
 
@@ -534,8 +532,9 @@
     sed "s;PREFIX=;PREFIX=$PREFIX;g" build_deps/deb/postinst \
     >$POSTINST
     if [ $ARCH == "amd64" ]; then
-	echo 'tar -xvf /tmp/Python32.tar.gz -C /opt/' >> $POSTINST
+	echo 'tar -xf /tmp/Python32.tar.gz -C /opt/' >> $POSTINST
     fi
+    echo 'tar -xf /tmp/alsalib.tar.gz -C /usr/local/' >> $POSTINST
     chmod +x $POSTINST
 }
 

Modified: software_suite_v2/tuxware/installers/unix/trunk/build_deps/deb/postinst
===================================================================
--- software_suite_v2/tuxware/installers/unix/trunk/build_deps/deb/postinst	2009-05-29 12:42:42 UTC (rev 4708)
+++ software_suite_v2/tuxware/installers/unix/trunk/build_deps/deb/postinst	2009-05-29 13:29:53 UTC (rev 4709)
@@ -3,6 +3,7 @@
 
 cd $PREFIX/lib/tuxdroid/python-api
 python setup.py install >/dev/null
+rm -r build
 cd - >/dev/null
 chmod +x $PREFIX/bin/*
 update-rc.d tuxhttpserver defaults >/dev/null