Author: nextgens
Date: 2006-08-09 09:51:48 +0000 (Wed, 09 Aug 2006)
New Revision: 9984
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:
* maybe fix the Stun plugin installation on macos
* Tidy the output on the processPanel
* maybe fix win32 uninstallation hooks
Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml 2006-08-09 02:55:12 UTC (rev
9983)
+++ trunk/apps/new_installer/install.xml 2006-08-09 09:51:48 UTC (rev
9984)
@@ -142,7 +142,7 @@
<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" os="windows" keep="true"
stage="uninstall"/>
+ <executable
targetfile="$INSTALL_PATH\bin\remove_service.bat" keep="true"
stage="uninstall"/>
</pack>
<pack name="Unix" required="yes" os="unix">
Modified: trunk/apps/new_installer/res/unix/bin/1run.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/1run.sh 2006-08-09 02:55:12 UTC
(rev 9983)
+++ trunk/apps/new_installer/res/unix/bin/1run.sh 2006-08-09 09:51:48 UTC
(rev 9984)
@@ -2,13 +2,13 @@
DST="$INSTALL_PATH"
-echo "install: $INSTALL_PATH"
+echo "Installing freenet in $INSTALL_PATH"
cd "$DST"
# Tweak freenet.ini before the first startup
if [[ -e stun ]]
then
- ./bin/install_jstun.sh
+ chmod +x ./bin/install_jstun.sh ; ./bin/install_jstun.sh &>/dev/null &&
rm -f ./bin/install_jstun.sh
echo "Enabling the STUN plugin"
echo "pluginmanager.loadplugin=plugins.JSTUN at
file://$INSTALL_PATH/plugins/JSTUN.jar;" >> freenet.ini
rm -f stun
@@ -20,9 +20,10 @@
rm -f update
fi
+echo "Detecting tcp-ports aviability..."
# Try to auto-detect the first aviable port for fproxy
FPROXY_PORT=8888
-java -jar bin/bindtest.jar $FPROXY_PORT
+java -jar bin/bindtest.jar $FPROXY_PORT &>/dev/null
if [[ $? -ne 0 ]]
then
FPROXY_PORT=8889
@@ -31,7 +32,7 @@
if [[ $? -ne 0 ]]
then
FPROXY_PORT=9999
- echo "Can not bind fproxy to 8889: force it to $FPROXY_PORT
insteed. You might have to edit freenet.ini by hand yourself to choose an
aviable, bindable tcp port."
+ echo "Can not bind fproxy to 8889: force it to $FPROXY_PORT
insteed."
fi
fi
echo -e "fproxy.enabled=true\nfproxy.port=$FPROXY_PORT" >> freenet.ini
@@ -42,7 +43,7 @@
if [[ $? -ne 0 ]]
then
FCP_PORT=9482
- echo "Can not bind fcp to 9481: force it to $FCP_PORT insteed. You
might have to edit freenet.ini by hand yourself to choose an aviable, bindable
tcp port."
+ echo "Can not bind fcp to 9481: force it to $FCP_PORT insteed."
fi
echo -e "fcp.enabled=true\nfcp.port=$FCP_PORT" >> freenet.ini
@@ -52,20 +53,20 @@
if [[ $? -ne 0 ]]
then
CONSOLE_PORT=2324
- echo "Can not bind console to 2323: force it to $CONSOLE_PORT insteed.
You might have to edit freenet.ini by hand yourself to choose an aviable,
bindable tcp port."
+ echo "Can not bind console to 2323: force it to $CONSOLE_PORT insteed."
fi
echo -e "console.enabled=true\nconsole.port=$CONSOLE_PORT" >> freenet.ini
# We need the exec flag on /bin
-chmod a+rx -R $INSTALL_PATH/bin $INSTALL_PATH/lib
+chmod a+rx -R $INSTALL_PATH/bin $INSTALL_PATH/lib &>/dev/null
echo "Downloading freenet-stable-latest.jar"
-java -jar bin/sha1test.jar freenet-stable-latest.jar "$DST" || exit 1
+java -jar bin/sha1test.jar freenet-stable-latest.jar "$DST" &>/dev/null ||
exit 1
ln -s freenet-stable-latest.jar freenet.jar
echo "Downloading freenet-ext.jar"
-java -jar bin/sha1test.jar freenet-ext.jar "$DST" || exit 1
+java -jar bin/sha1test.jar freenet-ext.jar "$DST" &>/dev/null || exit 1
echo "Downloading update.sh"
-java -jar bin/sha1test.jar update/update.sh "$DST" || exit 1
+java -jar bin/sha1test.jar update/update.sh "$DST" &>/dev/null || exit 1
chmod +x $DST/update.sh
# Starting the node up
Modified: trunk/apps/new_installer/res/windows/bin/1run.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/1run.cmd 2006-08-09 02:55:12 UTC
(rev 9983)
+++ trunk/apps/new_installer/res/windows/bin/1run.cmd 2006-08-09 09:51:48 UTC
(rev 9984)
@@ -6,7 +6,7 @@
@if not exist stun goto nostun
@echo pluginmanager.loadplugin=plugins.JSTUN at
file:///$INSTALL_PATH\plugins\JSTUN.jar >> freenet.ini
@mkdir plugins
- at java -jar bin\sha1test.jar JSTUN.jar plugins
+ at java -jar bin\sha1test.jar JSTUN.jar plugins > NUL
@del /F stun > NUL
:nostun
@if exist update echo node.updater.autoupdate=true >> freenet.ini
@@ -34,12 +34,12 @@
@echo console.port=%CONSOLE_PORT% >>freenet.ini
@echo "Downloading freenet-stable-latest.jar"
- at java -jar bin\sha1test.jar freenet-stable-latest.jar "$INSTALL_PATH"
+ at java -jar bin\sha1test.jar freenet-stable-latest.jar "$INSTALL_PATH" > NUL
@copy freenet-stable-latest.jar freenet.jar > NUl
@echo "Downloading freenet-ext.jar"
- at java -jar bin\sha1test.jar freenet-ext.jar "$INSTALL_PATH"
+ at java -jar bin\sha1test.jar freenet-ext.jar "$INSTALL_PATH" > NUL
@echo "Downloading update.cmd"
- at java -jar bin\sha1test.jar update/update.cmd "$INSTALL_PATH"
+ at java -jar bin\sha1test.jar update/update.cmd "$INSTALL_PATH" > NUL
@echo "Installing the wrapper"
@echo "Registering Freenet as a system service"
@bin\wrapper-windows-x86-32.exe -i ../wrapper.conf
