Author: ks156
Date: 2009-03-12 16:45:08 +0100 (Thu, 12 Mar 2009)
New Revision: 4016
Modified:
software_suite_v2/tuxware/installers/unix/branches/refactoring/software_updater/tux_software_updater.py
software_suite_v2/tuxware/pytuxisalive/branches/0.3.0/src/installer.sh
software_suite_v2/tuxware/tuxdroidserver/trunk/installer.sh
Log:
* Fixed some bugs with the prefix.
With the -i option, the destination is prefixed, but the path in the launcher
must contain only the final destination.
Modified:
software_suite_v2/tuxware/installers/unix/branches/refactoring/software_updater/tux_software_updater.py
===================================================================
---
software_suite_v2/tuxware/installers/unix/branches/refactoring/software_updater/tux_software_updater.py
2009-03-12 15:24:11 UTC (rev 4015)
+++
software_suite_v2/tuxware/installers/unix/branches/refactoring/software_updater/tux_software_updater.py
2009-03-12 15:45:08 UTC (rev 4016)
@@ -129,10 +129,10 @@
URLDownloadToFile(item['source'], "/tmp/tuxdroid_upd/%s"%filename)
os.system("tar -xf /tmp/tuxdroid_upd/%s -C /tmp/tuxdroid_upd/ &&\
- cd /tmp/tuxdroid_upd/%s && /bin/bash install.sh %s%s %s &&\
+ cd /tmp/tuxdroid_upd/%s && /bin/bash install.sh %s %s %s
&&\
rm -rf /tmp/tuxdroid_upd/" \
- %(filename, filename.split("-")[0], INSTALL, dest, INSTALL\
- + "/" + PREFIX))
+ %(filename, filename.split("-")[0], INSTALL + dest, \
+ INSTALL + PREFIX, dest))
print ''
writeDb(data)
Modified: software_suite_v2/tuxware/pytuxisalive/branches/0.3.0/src/installer.sh
===================================================================
--- software_suite_v2/tuxware/pytuxisalive/branches/0.3.0/src/installer.sh
2009-03-12 15:24:11 UTC (rev 4015)
+++ software_suite_v2/tuxware/pytuxisalive/branches/0.3.0/src/installer.sh
2009-03-12 15:45:08 UTC (rev 4016)
@@ -1,44 +1,43 @@
-#!/bin/bash
-#===============================================================================
-#
-# FILE: install.sh
-#
-# USAGE: ./install.sh
-#
-# DESCRIPTION:
-#
-# OPTIONS: ---
-# REQUIREMENTS: ---
-# BUGS: ---
-# NOTES: ---
-# AUTHOR: Paul Rathgeb (), [email protected]
-# COMPANY:
-# VERSION: 1.0
-# CREATED: 03/09/2009 11:12:41 AM CET
-# REVISION: ---
-#===============================================================================
-# Create build dir
-mkdir $1
-# Create the install script
-echo "#!/bin/bash" >> $1/install.sh
-echo "cd $1" >> $1/install.sh
-echo "python setup.py install >/dev/null" >> $1/install.sh
-echo "cd - > /dev/null" >> $1/install.sh
-echo 'mkdir -p $1' >> $1/install.sh
-echo "cp $1/tuxisalive/api/sh.py "'$1/sh.py' >> \
-$1/install.sh
-echo "cp $1/tuxisalive/api/version.py "'$1/version.py' >> \
-$1/install.sh
-echo 'echo "#!/bin/bash" > $2/bin/tuxsh' >> $1/install.sh
-echo 'echo python -i $1/sh.py >> $2/bin/tuxsh' >> \
-$1/install.sh
-echo 'chmod +x $2/bin/tuxsh' >> $1/install.sh
-echo "rm -r $1" >> $1/install.sh
-# Export the project
-svn export -q "$(svn info |grep URL |sed 's/URL: //g')" $1/$1
-# Create tarball
-rev=`svn info |grep "Last Changed Rev"`
-rev=${rev##* }
-tar -czf $1-$rev.tar.gz $1
-# Clean
-rm -r $1
+#!/bin/bash
+#===============================================================================
+#
+# FILE: install.sh
+#
+# USAGE: ./install.sh
+#
+# DESCRIPTION:
+#
+# OPTIONS: ---
+# REQUIREMENTS: ---
+# BUGS: ---
+# NOTES: ---
+# AUTHOR: Paul Rathgeb (), [email protected]
+# COMPANY:
+# VERSION: 1.0
+# CREATED: 03/09/2009 11:12:41 AM CET
+# REVISION: ---
+#===============================================================================
+# Create build dir
+mkdir $1
+# Create the install script
+echo "#!/bin/bash" >> $1/install.sh
+echo "cd $1" >> $1/install.sh
+echo "python setup.py install >/dev/null" >> $1/install.sh
+echo "cd - > /dev/null" >> $1/install.sh
+echo 'mkdir -p $1' >> $1/install.sh
+echo "cp $1/tuxisalive/api/sh.py "'$1/sh.py' >> \
+$1/install.sh
+echo '[ -d $2/bin ] || mkdir -p $2/bin' >> $1/install.sh
+echo 'echo "#!/bin/bash" > $2/bin/tuxsh' >> $1/install.sh
+echo 'echo python -i $3/sh.py >> $2/bin/tuxsh' >> \
+$1/install.sh
+echo 'chmod +x $2/bin/tuxsh' >> $1/install.sh
+echo "rm -r $1" >> $1/install.sh
+# Export the project
+svn export -q "$(svn info |grep URL |sed 's/URL: //g')" $1/$1
+# Create tarball
+rev=`svn info |grep "Last Changed Rev"`
+rev=${rev##* }
+tar -czf $1-$rev.tar.gz $1
+# Clean
+rm -r $1
Modified: software_suite_v2/tuxware/tuxdroidserver/trunk/installer.sh
===================================================================
--- software_suite_v2/tuxware/tuxdroidserver/trunk/installer.sh 2009-03-12
15:24:11 UTC (rev 4015)
+++ software_suite_v2/tuxware/tuxdroidserver/trunk/installer.sh 2009-03-12
15:45:08 UTC (rev 4016)
@@ -33,7 +33,7 @@
echo '[ -d /usr/bin/tuxhttpserver ] && rm /usr/bin/tuxhttpserver' >> \
$1/install.sh
echo 'echo "#!/bin/bash" > $2/bin/tuxhttpserver' >> $1/install.sh
-echo 'echo python "$1"/tuxhttpserver.py "\$*" >> $2/bin/tuxhttpserver' >>
$1/install.sh
+echo 'echo python "$3"/tuxhttpserver.py "\$*" >> $2/bin/tuxhttpserver' >>
$1/install.sh
echo 'chmod +x $2/bin/tuxhttpserver' >> $1/install.sh
# Export the project
svn export -q "$(svn info |grep URL |sed 's/URL: //g')" $1/$1_
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
