Author: ks156
Date: 2009-02-13 14:36:10 +0100 (Fri, 13 Feb 2009)
New Revision: 3632

Modified:
   software_suite_v2/tuxware/installers/unix/trunk/build.sh
   software_suite_v2/tuxware/installers/unix/trunk/build_deps/tar/Makefile
Log:
* Fixed some bugs with the installation PATHs


Modified: software_suite_v2/tuxware/installers/unix/trunk/build.sh
===================================================================
--- software_suite_v2/tuxware/installers/unix/trunk/build.sh    2009-02-13 
10:22:35 UTC (rev 3631)
+++ software_suite_v2/tuxware/installers/unix/trunk/build.sh    2009-02-13 
13:36:10 UTC (rev 3632)
@@ -415,6 +415,7 @@
     if [ ! -d $MIRROR_DIR/$path ]; then
         mkdir -p $MIRROR_DIR/$path
     fi
+    echo $url
     wget -q $url -O $MIRROR_DIR/$path/$file
 }
 
@@ -426,11 +427,14 @@
         # sed :
         # I have to replace $PREFIX (ascii sequence) by the environment
         # variable.
-        echo $line|cut -d ';' -f 3 |sed "s/\$PREFIX/\\${PREFIX}/g" >path
+        echo $PREFIX
+        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
+        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

Modified: 
software_suite_v2/tuxware/installers/unix/trunk/build_deps/tar/Makefile
===================================================================
--- software_suite_v2/tuxware/installers/unix/trunk/build_deps/tar/Makefile     
2009-02-13 10:22:35 UTC (rev 3631)
+++ software_suite_v2/tuxware/installers/unix/trunk/build_deps/tar/Makefile     
2009-02-13 13:36:10 UTC (rev 3632)
@@ -14,9 +14,12 @@
        rm -f /usr/bin/tux_wifi_channel
        rm -f /usr/bin/tuxup
        echo Copying files
+       if [ ! -e $(PREFIX) ]; then mkdir -p $(PREFIX); fi
        if [ ! -e $(PREFIX)/lib ]; then mkdir $(PREFIX)/lib; fi
        if [ ! -e $(PREFIX)/bin ]; then mkdir $(PREFIX)/bin; fi
        if [ ! -e $(PREFIX)/share]; then mkdir $(PREFIX)/share; fi
+       if [ ! -e $(PREFIX)/share/applications]; then mkdir 
$(PREFIX)/share/applications; fi
+       if [ ! -e $(PREFIX)/share/pixmaps]; then mkdir $(PREFIX)/share/pixmaps; 
fi
        cp -r ./mirror/etc/* /etc/
        cp -r ./mirror/opt /
        cp -r ./mirror/$(PREFIX)/lib/* $(PREFIX)/lib/


------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn

Reply via email to