Author: nextgens
Date: 2008-03-06 04:17:22 +0000 (Thu, 06 Mar 2008)
New Revision: 18381
Modified:
trunk/apps/new_installer/res/unix/bin/cleanup.sh
trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh
trunk/apps/new_installer/res/unix/bin/install_freenet-ext.sh
trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh
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_librarian.sh
trunk/apps/new_installer/res/unix/bin/install_mdns.sh
trunk/apps/new_installer/res/unix/bin/install_opennet.sh
trunk/apps/new_installer/res/unix/bin/install_plugins.sh
trunk/apps/new_installer/res/unix/bin/install_startup_hook-mac.sh
trunk/apps/new_installer/res/unix/bin/install_stun.sh
trunk/apps/new_installer/res/unix/bin/install_thaw.sh
trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh
trunk/apps/new_installer/res/unix/bin/install_updater.sh
trunk/apps/new_installer/res/unix/bin/install_upnp.sh
trunk/apps/new_installer/res/unix/bin/setup.sh
Log:
new_installer: prefer ipv4 over ipv6 during the install process
Modified: trunk/apps/new_installer/res/unix/bin/cleanup.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/cleanup.sh 2008-03-06 03:32:26 UTC
(rev 18380)
+++ trunk/apps/new_installer/res/unix/bin/cleanup.sh 2008-03-06 04:17:22 UTC
(rev 18381)
@@ -1,10 +1,11 @@
#!/bin/sh
-INSTALL_PATH="${INSTALL_PATH:-$PWD}"
-
cd "$INSTALL_PATH"
+source _install_toSource.sh
# We keep application installers in case users want to perform updates
rm -f 1run.sh cleanup.sh detect_port_availability.sh install_freenet-ext.sh
install_freenet-stable-latest.sh install_librarian.sh install_mdns.sh
install_plugins.sh install_stun.sh install_updater.sh setup.sh
install_startup_hook-mac.sh offline opennet.install
+rm -f _install_toSource.sh
+
echo "All done, please click Next"
Modified: trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh
2008-03-06 03:32:26 UTC (rev 18380)
+++ trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh
2008-03-06 04:17:22 UTC (rev 18381)
@@ -1,18 +1,17 @@
#!/bin/sh
-INSTALL_PATH="${INSTALL_PATH:-$PWD}"
-
cd "$INSTALL_PATH"
+source _install_toSource.sh
echo "Detecting tcp-ports availability..."
# Try to auto-detect the first available port for fproxy
FPROXY_PORT=8888
-java -jar bin/bindtest.jar $FPROXY_PORT 2>&1 >/dev/null
+java $JOPTS -jar bin/bindtest.jar $FPROXY_PORT 2>&1 >/dev/null
if test $? -ne 0
then
FPROXY_PORT=8889
echo "Can not bind fproxy to 8888: let's try $FPROXY_PORT instead."
- java -jar bin/bindtest.jar $FPROXY_PORT
+ java $JOPTS -jar bin/bindtest.jar $FPROXY_PORT
if test $? -ne 0
then
FPROXY_PORT=9999
@@ -26,7 +25,7 @@
# Try to auto-detect the first available port for fcp
FCP_PORT=9481
-java -jar bin/bindtest.jar $FCP_PORT 2>&1 >/dev/null
+java $JOPTS -jar bin/bindtest.jar $FCP_PORT 2>&1 >/dev/null
if test $? -ne 0
then
FCP_PORT=9482
Modified: trunk/apps/new_installer/res/unix/bin/install_freenet-ext.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_freenet-ext.sh
2008-03-06 03:32:26 UTC (rev 18380)
+++ trunk/apps/new_installer/res/unix/bin/install_freenet-ext.sh
2008-03-06 04:17:22 UTC (rev 18381)
@@ -1,11 +1,10 @@
#!/bin/bash
-INSTALL_PATH="${INSTALL_PATH:-$PWD}"
-
cd "$INSTALL_PATH"
+source _install_toSource.sh
if test ! -e offline
then
echo "Downloading freenet-ext.jar"
- java -jar bin/sha1test.jar freenet-ext.jar "$INSTALL_PATH" >/dev/null
2>&1 || exit 1
+ java $JOPTS -jar bin/sha1test.jar freenet-ext.jar "$INSTALL_PATH"
>/dev/null 2>&1 || exit 1
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh
2008-03-06 03:32:26 UTC (rev 18380)
+++ trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh
2008-03-06 04:17:22 UTC (rev 18381)
@@ -1,13 +1,12 @@
#!/bin/bash
-INSTALL_PATH="${INSTALL_PATH:-$PWD}"
-
cd "$INSTALL_PATH"
+source _install_toSource.sh
if test ! -e offline
then
echo "Downloading freenet-stable-latest.jar"
- java -jar bin/sha1test.jar freenet-stable-latest.jar "$INSTALL_PATH"
>/dev/null 2>&1 || exit 1
+ java $JOPTS -jar bin/sha1test.jar freenet-stable-latest.jar
"$INSTALL_PATH" >/dev/null 2>&1 || exit 1
fi
rm -f freenet.jar
Modified: trunk/apps/new_installer/res/unix/bin/install_frost.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_frost.sh 2008-03-06
03:32:26 UTC (rev 18380)
+++ trunk/apps/new_installer/res/unix/bin/install_frost.sh 2008-03-06
04:17:22 UTC (rev 18381)
@@ -1,8 +1,7 @@
#!/bin/bash
-INSTALL_PATH="${INSTALL_PATH:-$PWD}"
-
cd "$INSTALL_PATH"
+source _install_toSource.sh
if test -e frost.install
then
@@ -10,9 +9,9 @@
if test ! -e offline
then
echo "Downloading frost"
- java -jar bin/sha1test.jar frost/frost.zip ./ >/dev/null 2>&1
|| exit 1
+ java $JOPTS -jar bin/sha1test.jar frost/frost.zip ./ >/dev/null
2>&1 || exit 1
fi
echo "Unzipping frost"
mkdir frost
- java -jar bin/uncompress.jar frost.zip frost >/dev/null 2>&1
+ java $JOPTS -jar bin/uncompress.jar frost.zip frost >/dev/null 2>&1
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_jSite.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_jSite.sh 2008-03-06
03:32:26 UTC (rev 18380)
+++ trunk/apps/new_installer/res/unix/bin/install_jSite.sh 2008-03-06
04:17:22 UTC (rev 18381)
@@ -1,8 +1,7 @@
#!/bin/bash
-INSTALL_PATH="${INSTALL_PATH:-$PWD}"
-
cd "$INSTALL_PATH"
+source _install_toSource.sh
if test -e jsite.install
then
@@ -11,6 +10,6 @@
then
echo "Downloading jSite"
mkdir jSite
- java -jar bin/sha1test.jar jSite/jSite.jar jSite >/dev/null
2>&1 || exit 1
+ java $JOPTS -jar bin/sha1test.jar jSite/jSite.jar jSite
>/dev/null 2>&1 || exit 1
fi
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_librarian.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_librarian.sh 2008-03-06
03:32:26 UTC (rev 18380)
+++ trunk/apps/new_installer/res/unix/bin/install_librarian.sh 2008-03-06
04:17:22 UTC (rev 18381)
@@ -1,8 +1,7 @@
#!/bin/sh
-INSTALL_PATH="${INSTALL_PATH:-$PWD}"
-
cd "$INSTALL_PATH"
+source _install_toSource.sh
if test -e xmllibrarian -a -e plug
then
@@ -13,7 +12,7 @@
mv -f plug2 plug
if test ! -e offline
then
- java -jar bin/sha1test.jar plugins/XMLLibrarian.jar.url plugins
>/dev/null 2>&1
+ java $JOPTS -jar bin/sha1test.jar plugins/XMLLibrarian.jar.url
plugins >/dev/null 2>&1
fi
rm -f xmllibrarian
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_mdns.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_mdns.sh 2008-03-06
03:32:26 UTC (rev 18380)
+++ trunk/apps/new_installer/res/unix/bin/install_mdns.sh 2008-03-06
04:17:22 UTC (rev 18381)
@@ -1,8 +1,7 @@
#!/bin/sh
-INSTALL_PATH="${INSTALL_PATH:-$PWD}"
-
cd "$INSTALL_PATH"
+source _install_toSource.sh
if test -e mdns -a -e plug
then
@@ -13,7 +12,7 @@
mv -f plug2 plug
if test ! -e offline
then
- java -jar bin/sha1test.jar plugins/MDNSDiscovery.jar.url
plugins >/dev/null 2>&1
+ java $JOPTS -jar bin/sha1test.jar plugins/MDNSDiscovery.jar.url
plugins >/dev/null 2>&1
fi
rm -f mdns
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_opennet.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_opennet.sh 2008-03-06
03:32:26 UTC (rev 18380)
+++ trunk/apps/new_installer/res/unix/bin/install_opennet.sh 2008-03-06
04:17:22 UTC (rev 18381)
@@ -1,8 +1,7 @@
#!/bin/bash
-INSTALL_PATH="${INSTALL_PATH:-$PWD}"
-
cd "$INSTALL_PATH"
+source _install_toSource.sh
if test -e opennet.install
then
@@ -10,6 +9,6 @@
if test ! -e offline
then
echo "Downloading the Opennet seednode file"
- java -jar bin/sha1test.jar opennet/seednodes.fref . >/dev/null
2>&1 || exit 1
+ java $JOPTS -jar bin/sha1test.jar opennet/seednodes.fref .
>/dev/null 2>&1 || exit 1
fi
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_plugins.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_plugins.sh 2008-03-06
03:32:26 UTC (rev 18380)
+++ trunk/apps/new_installer/res/unix/bin/install_plugins.sh 2008-03-06
04:17:22 UTC (rev 18381)
@@ -1,8 +1,7 @@
#!/bin/bash
-INSTALL_PATH="${INSTALL_PATH:-$PWD}"
-
cd "$INSTALL_PATH"
+source _install_toSource.sh
if test -e plug
then
Modified: trunk/apps/new_installer/res/unix/bin/install_startup_hook-mac.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_startup_hook-mac.sh
2008-03-06 03:32:26 UTC (rev 18380)
+++ trunk/apps/new_installer/res/unix/bin/install_startup_hook-mac.sh
2008-03-06 04:17:22 UTC (rev 18381)
@@ -6,6 +6,7 @@
SCRIPT_PLIST="$STARTUP_PATH/Freenet/Freenet.plist"
cd "$INSTALL_PATH"
+source _install_toSource.sh
echo "Creating a startup script for Freenet"
Modified: trunk/apps/new_installer/res/unix/bin/install_stun.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_stun.sh 2008-03-06
03:32:26 UTC (rev 18380)
+++ trunk/apps/new_installer/res/unix/bin/install_stun.sh 2008-03-06
04:17:22 UTC (rev 18381)
@@ -1,8 +1,7 @@
#!/bin/sh
-INSTALL_PATH="${INSTALL_PATH:-$PWD}"
-
cd "$INSTALL_PATH"
+source _install_toSource.sh
if test -e stun -a -e plug
then
@@ -13,7 +12,7 @@
mv -f plug2 plug
if test ! -e offline
then
- java -jar bin/sha1test.jar plugins/JSTUN.jar.url plugins
>/dev/null 2>&1
+ java $JOPTS -jar bin/sha1test.jar plugins/JSTUN.jar.url plugins
>/dev/null 2>&1
fi
rm -f stun
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_thaw.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_thaw.sh 2008-03-06
03:32:26 UTC (rev 18380)
+++ trunk/apps/new_installer/res/unix/bin/install_thaw.sh 2008-03-06
04:17:22 UTC (rev 18381)
@@ -1,8 +1,7 @@
#!/bin/bash
-INSTALL_PATH="${INSTALL_PATH:-$PWD}"
-
cd "$INSTALL_PATH"
+source _install_toSource.sh
if test -e thaw.install
then
@@ -11,6 +10,6 @@
then
echo "Downloading Thaw"
mkdir Thaw
- java -jar bin/sha1test.jar Thaw/Thaw.jar Thaw >/dev/null 2>&1
|| exit 1
+ java $JOPTS -jar bin/sha1test.jar Thaw/Thaw.jar Thaw >/dev/null
2>&1 || exit 1
fi
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh
2008-03-06 03:32:26 UTC (rev 18380)
+++ trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh
2008-03-06 04:17:22 UTC (rev 18381)
@@ -1,8 +1,7 @@
#!/bin/sh
-INSTALL_PATH="${INSTALL_PATH:-$PWD}"
-
cd "$INSTALL_PATH"
+source _install_toSource.sh
if test -e thingamablog.install
then
@@ -10,8 +9,8 @@
if test ! -e offline
then
echo "Downloading thingamablog"
- java -jar bin/sha1test.jar thingamablog/thingamablog.zip ./
>/dev/null 2>&1 || exit 1
+ java $JOPTS -jar bin/sha1test.jar thingamablog/thingamablog.zip
./ >/dev/null 2>&1 || exit 1
fi
echo "Unzipping thingamablog"
- java -jar bin/uncompress.jar thingamablog.zip . >/dev/null 2>&1
+ java $JOPTS -jar bin/uncompress.jar thingamablog.zip . >/dev/null 2>&1
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_updater.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_updater.sh 2008-03-06
03:32:26 UTC (rev 18380)
+++ trunk/apps/new_installer/res/unix/bin/install_updater.sh 2008-03-06
04:17:22 UTC (rev 18381)
@@ -1,8 +1,7 @@
#!/bin/sh
-INSTALL_PATH="${INSTALL_PATH:-$PWD}"
-
cd "$INSTALL_PATH"
+source _install_toSource.sh
# Tweak freenet.ini before the first startup
echo "node.updater.enabled=true" > freenet.ini
@@ -16,7 +15,7 @@
if test ! -e offline
then
echo "Downloading update.sh"
- java -jar bin/sha1test.jar update/update.sh >/dev/null 2>&1 || exit 1
+ java $JOPTS -jar bin/sha1test.jar update/update.sh >/dev/null 2>&1 ||
exit 1
fi
if test -e update.sh
Modified: trunk/apps/new_installer/res/unix/bin/install_upnp.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_upnp.sh 2008-03-06
03:32:26 UTC (rev 18380)
+++ trunk/apps/new_installer/res/unix/bin/install_upnp.sh 2008-03-06
04:17:22 UTC (rev 18381)
@@ -1,8 +1,7 @@
#!/bin/sh
-INSTALL_PATH="${INSTALL_PATH:-$PWD}"
-
cd "$INSTALL_PATH"
+source _install_toSource.sh
if test -e upnp -a -e plug
then
@@ -13,7 +12,7 @@
mv -f plug2 plug
if test ! -e offline
then
- java -jar bin/sha1test.jar plugins/UPnP.jar.url plugins
>/dev/null 2>&1
+ java $JOPTS -jar bin/sha1test.jar plugins/UPnP.jar.url plugins
>/dev/null 2>&1
fi
rm -f upnp
fi
Modified: trunk/apps/new_installer/res/unix/bin/setup.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/setup.sh 2008-03-06 03:32:26 UTC
(rev 18380)
+++ trunk/apps/new_installer/res/unix/bin/setup.sh 2008-03-06 04:17:22 UTC
(rev 18381)
@@ -1,9 +1,12 @@
#!/bin/sh
INSTALL_PATH="${INSTALL_PATH:-$PWD}"
-
cd "$INSTALL_PATH"
+echo '#!/bin/sh' > _install_toSource.sh
+echo INSTALL_PATH=\"$INSTALL_PATH\" >> _install_toSource.sh
+echo JOPTS=\" -Djava.net.preferIPv4Stack=true \" >> _install_toSource.sh
+
if test -s freenet.ini
then
echo "This script isn't meant to be used more than once. I will rename
your freenet.ini to freenet.old.ini and go on, but don't complain if it
breaks\!"
