Author: nextgens
Date: 2006-08-09 12:25:31 +0000 (Wed, 09 Aug 2006)
New Revision: 9993
Removed:
trunk/apps/new_installer/res/unix/bin/install_frost.sh
trunk/apps/new_installer/res/unix/bin/install_jSite.sh
trunk/apps/new_installer/res/unix/bin/install_thaw.sh
trunk/apps/new_installer/res/windows/bin/install_frost.cmd
trunk/apps/new_installer/res/windows/bin/install_jSite.cmd
trunk/apps/new_installer/res/windows/bin/install_thaw.cmd
Modified:
trunk/apps/new_installer/install.xml
trunk/apps/new_installer/res/unix/bin/1run.sh
trunk/apps/new_installer/res/windows/bin/1run.cmd
Log:
new_installer: fix the installation stuckness during the post-install stage
Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml 2006-08-09 12:09:57 UTC (rev
9992)
+++ trunk/apps/new_installer/install.xml 2006-08-09 12:25:31 UTC (rev
9993)
@@ -139,9 +139,6 @@
<include name="bin/**/*"/>
</fileset>
<parsable targetfile="$INSTALL_PATH\bin\1run.cmd"/>
- <parsable
targetfile="$INSTALL_PATH\bin\install_jSite.cmd"/>
- <parsable
targetfile="$INSTALL_PATH\bin\install_frost.cmd"/>
- <parsable
targetfile="$INSTALL_PATH\bin\install_jSite.cmd"/>
<executable
targetfile="$INSTALL_PATH\bin\remove_service.bat" keep="true"
stage="uninstall"/>
</pack>
@@ -158,9 +155,6 @@
<executable targetfile="$INSTALL_PATH/run.sh"
type="bin" stage="never" keep="true"/>
<executable targetfile="$INSTALL_PATH/bin/1run.sh"
type="bin" stage="never"/>
<parsable targetfile="$INSTALL_PATH/bin/1run.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_jSite.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_frost.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_thaw.sh"/>
<parsable
targetfile="$INSTALL_PATH/bin/install_jstun.sh"/>
</pack>
@@ -181,20 +175,17 @@
<pack name="jSite" required="no">
<description>A tool to upload websites to
freenet</description>
- <executable
targetfile="$INSTALL_PATH/bin/install_jSite.sh" type="bin" stage="postinstall"
os="unix"/>
- <executable
targetfile="$INSTALL_PATH\bin\install_jSite.cmd" type="bin" stage="postinstall"
os="windows"/>
+ <singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/jsite"/>
</pack>
<pack name="frost" required="no">
<description>A message board application for freenet
(http://jtcfrost.sourceforge.net/</description>
- <executable
targetfile="$INSTALL_PATH/bin/install_frost.sh" type="bin" stage="postinstall"
os="unix"/>
- <executable
targetfile="$INSTALL_PATH\bin\install_frost.cmd" type="bin" stage="postinstall"
os="windows"/>
+ <singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/frost"/>
</pack>
<pack name="thaw" required="no">
<description>A powerful filesharing tool designed for
freenet</description>
- <executable
targetfile="$INSTALL_PATH/bin/install_thaw.sh" type="bin" stage="postinstall"
os="unix"/>
- <executable
targetfile="$INSTALL_PATH\bin\install_thaw.cmd" type="bin" stage="postinstall"
os="windows"/>
+ <singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/thaw"/>
</pack>
</packs>
Modified: trunk/apps/new_installer/res/unix/bin/1run.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/1run.sh 2006-08-09 12:09:57 UTC
(rev 9992)
+++ trunk/apps/new_installer/res/unix/bin/1run.sh 2006-08-09 12:25:31 UTC
(rev 9993)
@@ -77,6 +77,30 @@
java -cp bin/browser.jar BareBonesBrowserLaunch
"http://127.0.0.1:$FPROXY_PORT/";
java -cp bin/browser.jar BareBonesBrowserLaunch
"file:///$INSTALL_PATH/welcome.html"
+if [[ -e thaw ]]
+then
+ rm -f thaw
+ echo "Downloading Thaw"
+ java -jar bin/sha1test.jar Thaw/Thaw.jar ./ &>/dev/null || exit 1
+fi
+
+if [[ -e jsite ]]
+then
+ rm -f jsite
+ echo "Downloading jSite"
+ java -jar bin/sha1test.jar jSite/jSite.jar ./ &>/dev/null || exit 1
+fi
+
+if [[ -e frost ]]
+then
+ rm -f frost
+ echo "Downloading frost"
+ java -jar bin/sha1test.jar frost/frost.zip ./ &>/dev/null || exit 1
+ echo "Unzipping frost"
+ mkdir frost
+ java -jar bin/uncompress.jar frost.zip frost &>/dev/null
+fi
+
echo "Finished"
exit 0
Deleted: trunk/apps/new_installer/res/unix/bin/install_frost.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_frost.sh 2006-08-09
12:09:57 UTC (rev 9992)
+++ trunk/apps/new_installer/res/unix/bin/install_frost.sh 2006-08-09
12:25:31 UTC (rev 9993)
@@ -1,8 +0,0 @@
-#!/bin/bash
-cd $INSTALL_PATH/bin
-echo "Downloading frost"
-java -jar sha1test.jar frost/frost.zip ../ || exit 1
-echo "Unzipping frost"
-mkdir ../frost
-java -jar uncompress.jar ../frost.zip ../frost
-echo "Done"
Deleted: trunk/apps/new_installer/res/unix/bin/install_jSite.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_jSite.sh 2006-08-09
12:09:57 UTC (rev 9992)
+++ trunk/apps/new_installer/res/unix/bin/install_jSite.sh 2006-08-09
12:25:31 UTC (rev 9993)
@@ -1,5 +0,0 @@
-#!/bin/bash
-cd $INSTALL_PATH/bin
-echo "Downloading jSite"
-java -jar sha1test.jar jSite/jSite.jar ../ || exit 1
-echo "Done"
Deleted: trunk/apps/new_installer/res/unix/bin/install_thaw.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_thaw.sh 2006-08-09
12:09:57 UTC (rev 9992)
+++ trunk/apps/new_installer/res/unix/bin/install_thaw.sh 2006-08-09
12:25:31 UTC (rev 9993)
@@ -1,5 +0,0 @@
-#!/bin/bash
-cd $INSTALL_PATH/bin
-echo "Downloading Thaw"
-java -jar sha1test.jar Thaw/Thaw.jar ../ || exit 1
-echo "Done"
Modified: trunk/apps/new_installer/res/windows/bin/1run.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/1run.cmd 2006-08-09 12:09:57 UTC
(rev 9992)
+++ trunk/apps/new_installer/res/windows/bin/1run.cmd 2006-08-09 12:25:31 UTC
(rev 9993)
@@ -52,4 +52,30 @@
@echo "Spawing up a browser"
@start http://127.0.0.1:%FPROXY_PORT%/
@start welcome.html
+
+:: Installing additionnal softwares
+ at if not exist jsite goto nojsite
+ at del /F jsite > NUL
+ at echo "Downloading jSite"
+ at java -jar bin\sha1test.jar jSite/jSite.jar .
+ at echo "Done"
+:nojsite
+
+ at if not exist thaw goto nothaw
+ at del /F thaw > NUL
+ at echo "Downloading Thaw"
+ at java -jar bin\sha1test.jar Thaw/Thaw.jar .
+ at echo "Done"
+:nothaw
+
+ at if not exist frost goto nofrost
+ at del /F frost > NUL
+ at echo "Downloading Frost"
+ at java -jar bin\sha1test.jar frost/frost.zip .
+ at echo "Setting Frost up"
+ at mkdir frost
+ at java -jar uncompress.jar frost.zip frost
+ at echo "Done"
+:nofrost
+
@echo "Finished"
Deleted: trunk/apps/new_installer/res/windows/bin/install_frost.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_frost.cmd 2006-08-09
12:09:57 UTC (rev 9992)
+++ trunk/apps/new_installer/res/windows/bin/install_frost.cmd 2006-08-09
12:25:31 UTC (rev 9993)
@@ -1,8 +0,0 @@
- at echo "Downloading Frost"
- at set PATH=%SYSTEMROOT%\System32\;%PATH%
- at cd $INSTALL_PATH\bin
- at java -jar sha1test.jar frost/frost.zip ../
- at echo "Setting Frost up"
- at mkdir ../frost
- at java -jar uncompress.jar ../frost.zip ../frost
- at echo "Done"
Deleted: trunk/apps/new_installer/res/windows/bin/install_jSite.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_jSite.cmd 2006-08-09
12:09:57 UTC (rev 9992)
+++ trunk/apps/new_installer/res/windows/bin/install_jSite.cmd 2006-08-09
12:25:31 UTC (rev 9993)
@@ -1,5 +0,0 @@
- at echo "Downloading jSite"
- at set PATH=%SYSTEMROOT%\System32\;%PATH%
- at cd $INSTALL_PATH\bin
- at java -jar sha1test.jar jSite/jSite.jar ../
- at echo "Done"
Deleted: trunk/apps/new_installer/res/windows/bin/install_thaw.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_thaw.cmd 2006-08-09
12:09:57 UTC (rev 9992)
+++ trunk/apps/new_installer/res/windows/bin/install_thaw.cmd 2006-08-09
12:25:31 UTC (rev 9993)
@@ -1,5 +0,0 @@
- at echo "Downloading Thaw"
- at set PATH=%SYSTEMROOT%\System32\;%PATH%
- at cd $INSTALL_PATH\bin
- at java -jar sha1test Thaw/Thaw.jar ../
- at echo "Done"
