Author: nextgens
Date: 2008-03-23 06:43:37 +0000 (Sun, 23 Mar 2008)
New Revision: 18726
Modified:
trunk/apps/new_installer/install.xml
trunk/apps/new_installer/res/unix/bin/1run.sh
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: maybe fix the '_install_toSource.sh file not found' error
Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml 2008-03-23 03:25:48 UTC (rev
18725)
+++ trunk/apps/new_installer/install.xml 2008-03-23 06:43:37 UTC (rev
18726)
@@ -180,24 +180,9 @@
<executable targetfile="$INSTALL_PATH/run.sh"
type="bin" stage="never" keep="true"/>
<executable targetfile="$INSTALL_PATH/bin/setup.sh"
type="bin" stage="never"/>
+ <executable targetfile="$INSTALL_PATH/bin/browse.sh"
type="bin" stage="never"/>
<parsable targetfile="$INSTALL_PATH/bin/browse.sh"/>
<parsable targetfile="$INSTALL_PATH/bin/setup.sh"/>
- <parsable targetfile="$INSTALL_PATH/bin/1run.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/detect_port_availability.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_frost.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_jSite.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_librarian.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_mdns.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_stun.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_upnp.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_thaw.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_thingamablog.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_updater.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_freenet-ext.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_freenet-stable-latest.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_plugins.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_opennet.sh"/>
- <parsable targetfile="$INSTALL_PATH/bin/cleanup.sh"/>
</pack>
<!-- Yes it's a rip of the unix one, but I haven't found any
smarter way to do it! -->
@@ -219,25 +204,9 @@
<executable targetfile="$INSTALL_PATH/run.sh"
type="bin" stage="never" keep="true"/>
<executable targetfile="$INSTALL_PATH/bin/setup.sh"
type="bin" stage="never"/>
+ <executable targetfile="$INSTALL_PATH/bin/browse.sh"
type="bin" stage="never"/>
<parsable targetfile="$INSTALL_PATH/bin/browse.sh"/>
<parsable targetfile="$INSTALL_PATH/bin/setup.sh"/>
- <parsable targetfile="$INSTALL_PATH/bin/1run.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/detect_port_availability.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_frost.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_jSite.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_librarian.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_mdns.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_stun.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_upnp.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_thaw.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_thingamablog.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_updater.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_freenet-ext.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_freenet-stable-latest.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_plugins.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_opennet.sh"/>
- <parsable
targetfile="$INSTALL_PATH/bin/install_startup_hook-mac.sh"/>
- <parsable targetfile="$INSTALL_PATH/bin/cleanup.sh"/>
</pack>
<pack name="UninstallStuff" id="uninstall" required="no"
os="windows">
Modified: trunk/apps/new_installer/res/unix/bin/1run.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/1run.sh 2008-03-23 03:25:48 UTC
(rev 18725)
+++ trunk/apps/new_installer/res/unix/bin/1run.sh 2008-03-23 06:43:37 UTC
(rev 18726)
@@ -1,7 +1,6 @@
#!/bin/sh
-INSTALL_PATH="${INSTALL_PATH:-$PWD}"
-
+. _install_toSource.sh
cd "$INSTALL_PATH"
echo End >> freenet.ini
Modified: trunk/apps/new_installer/res/unix/bin/cleanup.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/cleanup.sh 2008-03-23 03:25:48 UTC
(rev 18725)
+++ trunk/apps/new_installer/res/unix/bin/cleanup.sh 2008-03-23 06:43:37 UTC
(rev 18726)
@@ -1,11 +1,11 @@
#!/bin/sh
+. _install_toSource.sh
+rm -f _install_toSource.sh
cd "$INSTALL_PATH"
-. _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 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 install_frost.sh setup.sh
install_startup_hook-mac.sh offline opennet.install
-rm -f _install_toSource.sh install_frost.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-23 03:25:48 UTC (rev 18725)
+++ trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh
2008-03-23 06:43:37 UTC (rev 18726)
@@ -1,7 +1,7 @@
#!/bin/sh
+. _install_toSource.sh
cd "$INSTALL_PATH"
-. _install_toSource.sh
echo "Detecting tcp-ports availability..."
# Try to auto-detect the first available port for fproxy
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-23 03:25:48 UTC (rev 18725)
+++ trunk/apps/new_installer/res/unix/bin/install_freenet-ext.sh
2008-03-23 06:43:37 UTC (rev 18726)
@@ -1,7 +1,7 @@
#!/bin/sh
+. _install_toSource.sh
cd "$INSTALL_PATH"
-. _install_toSource.sh
if test ! -e offline
then
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-23 03:25:48 UTC (rev 18725)
+++ trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh
2008-03-23 06:43:37 UTC (rev 18726)
@@ -1,7 +1,7 @@
#!/bin/sh
+. _install_toSource.sh
cd "$INSTALL_PATH"
-. _install_toSource.sh
if test ! -e offline
then
Modified: trunk/apps/new_installer/res/unix/bin/install_frost.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_frost.sh 2008-03-23
03:25:48 UTC (rev 18725)
+++ trunk/apps/new_installer/res/unix/bin/install_frost.sh 2008-03-23
06:43:37 UTC (rev 18726)
@@ -1,7 +1,7 @@
#!/bin/sh
+. _install_toSource.sh
cd "$INSTALL_PATH"
-. _install_toSource.sh
if test -e frost.install
then
Modified: trunk/apps/new_installer/res/unix/bin/install_jSite.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_jSite.sh 2008-03-23
03:25:48 UTC (rev 18725)
+++ trunk/apps/new_installer/res/unix/bin/install_jSite.sh 2008-03-23
06:43:37 UTC (rev 18726)
@@ -1,7 +1,7 @@
#!/bin/sh
+. _install_toSource.sh
cd "$INSTALL_PATH"
-. _install_toSource.sh
if test -e jsite.install
then
Modified: trunk/apps/new_installer/res/unix/bin/install_librarian.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_librarian.sh 2008-03-23
03:25:48 UTC (rev 18725)
+++ trunk/apps/new_installer/res/unix/bin/install_librarian.sh 2008-03-23
06:43:37 UTC (rev 18726)
@@ -1,7 +1,7 @@
#!/bin/sh
+. _install_toSource.sh
cd "$INSTALL_PATH"
-. _install_toSource.sh
if test -e xmllibrarian -a -e plug
then
Modified: trunk/apps/new_installer/res/unix/bin/install_mdns.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_mdns.sh 2008-03-23
03:25:48 UTC (rev 18725)
+++ trunk/apps/new_installer/res/unix/bin/install_mdns.sh 2008-03-23
06:43:37 UTC (rev 18726)
@@ -1,7 +1,7 @@
#!/bin/sh
+. _install_toSource.sh
cd "$INSTALL_PATH"
-. _install_toSource.sh
if test -e mdns -a -e plug
then
Modified: trunk/apps/new_installer/res/unix/bin/install_opennet.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_opennet.sh 2008-03-23
03:25:48 UTC (rev 18725)
+++ trunk/apps/new_installer/res/unix/bin/install_opennet.sh 2008-03-23
06:43:37 UTC (rev 18726)
@@ -1,7 +1,7 @@
#!/bin/sh
+. _install_toSource.sh
cd "$INSTALL_PATH"
-. _install_toSource.sh
if test -e opennet.install
then
Modified: trunk/apps/new_installer/res/unix/bin/install_plugins.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_plugins.sh 2008-03-23
03:25:48 UTC (rev 18725)
+++ trunk/apps/new_installer/res/unix/bin/install_plugins.sh 2008-03-23
06:43:37 UTC (rev 18726)
@@ -1,7 +1,7 @@
#!/bin/sh
+. _install_toSource.sh
cd "$INSTALL_PATH"
-. _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-23 03:25:48 UTC (rev 18725)
+++ trunk/apps/new_installer/res/unix/bin/install_startup_hook-mac.sh
2008-03-23 06:43:37 UTC (rev 18726)
@@ -1,12 +1,11 @@
#!/bin/sh
-INSTALL_PATH="${INSTALL_PATH:-$PWD}"
STARTUP_PATH="/Library/StartupItems/"
SCRIPT="$STARTUP_PATH/Freenet/Freenet.sh"
SCRIPT_PLIST="$STARTUP_PATH/Freenet/Freenet.plist"
-cd "$INSTALL_PATH"
. _install_toSource.sh
+cd "$INSTALL_PATH"
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-23
03:25:48 UTC (rev 18725)
+++ trunk/apps/new_installer/res/unix/bin/install_stun.sh 2008-03-23
06:43:37 UTC (rev 18726)
@@ -1,7 +1,7 @@
#!/bin/sh
+. _install_toSource.sh
cd "$INSTALL_PATH"
-. _install_toSource.sh
if test -e stun -a -e plug
then
Modified: trunk/apps/new_installer/res/unix/bin/install_thaw.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_thaw.sh 2008-03-23
03:25:48 UTC (rev 18725)
+++ trunk/apps/new_installer/res/unix/bin/install_thaw.sh 2008-03-23
06:43:37 UTC (rev 18726)
@@ -1,7 +1,7 @@
#!/bin/sh
+. _install_toSource.sh
cd "$INSTALL_PATH"
-. _install_toSource.sh
if test -e thaw.install
then
Modified: trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh
2008-03-23 03:25:48 UTC (rev 18725)
+++ trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh
2008-03-23 06:43:37 UTC (rev 18726)
@@ -1,7 +1,7 @@
#!/bin/sh
+. _install_toSource.sh
cd "$INSTALL_PATH"
-. _install_toSource.sh
if test -e thingamablog.install
then
Modified: trunk/apps/new_installer/res/unix/bin/install_updater.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_updater.sh 2008-03-23
03:25:48 UTC (rev 18725)
+++ trunk/apps/new_installer/res/unix/bin/install_updater.sh 2008-03-23
06:43:37 UTC (rev 18726)
@@ -1,7 +1,7 @@
#!/bin/sh
+. _install_toSource.sh
cd "$INSTALL_PATH"
-. _install_toSource.sh
# Tweak freenet.ini before the first startup
echo "node.updater.enabled=true" > freenet.ini
Modified: trunk/apps/new_installer/res/unix/bin/install_upnp.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_upnp.sh 2008-03-23
03:25:48 UTC (rev 18725)
+++ trunk/apps/new_installer/res/unix/bin/install_upnp.sh 2008-03-23
06:43:37 UTC (rev 18726)
@@ -1,7 +1,7 @@
#!/bin/sh
+. _install_toSource.sh
cd "$INSTALL_PATH"
-. _install_toSource.sh
if test -e upnp -a -e plug
then
Modified: trunk/apps/new_installer/res/unix/bin/setup.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/setup.sh 2008-03-23 03:25:48 UTC
(rev 18725)
+++ trunk/apps/new_installer/res/unix/bin/setup.sh 2008-03-23 06:43:37 UTC
(rev 18726)
@@ -1,14 +1,14 @@
#!/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
chmod 755 _install_toSource.sh
alias .=
+cd "$INSTALL_PATH"
+
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\!"
