Author: nextgens
Date: 2007-04-06 18:55:45 +0000 (Fri, 06 Apr 2007)
New Revision: 12544
Added:
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_plugins.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_updater.sh
trunk/apps/new_installer/res/unix/bin/setup.sh
Modified:
trunk/apps/new_installer/ProcessPanel.Spec.xml
trunk/apps/new_installer/install.xml
trunk/apps/new_installer/res/unix/bin/1run.sh
Log:
new_installer: split the installer into small parts so that the progressbar
works ... I ought to do the same for windows someday... Feedback would be
appreciated
Modified: trunk/apps/new_installer/ProcessPanel.Spec.xml
===================================================================
--- trunk/apps/new_installer/ProcessPanel.Spec.xml 2007-04-06 17:35:23 UTC
(rev 12543)
+++ trunk/apps/new_installer/ProcessPanel.Spec.xml 2007-04-06 18:55:45 UTC
(rev 12544)
@@ -1,14 +1,99 @@
<processing>
- <job name="Downloading required files (windows)">
- <os family="windows" />
- <executefile name="$INSTALL_PATH\bin\1run.cmd"/>
+ <!-- Must be first! -->
+ <job name="Setting up the environment">
+ <os family="unix" />
+ <os family="mac" />
+ <os family="macosx" />
+ <executefile name="$INSTALL_PATH/bin/setup.sh"/>
</job>
- <job name="Downloading required files (unix)">
+
+ <job name="Setting the Updater up">
<os family="unix" />
- <executefile name="$INSTALL_PATH/bin/1run.sh"/>
+ <os family="mac" />
+ <os family="macosx" />
+ <executefile name="$INSTALL_PATH/bin/install_updater.sh"/>
</job>
- <job name="Downloading required files (unix)">
+ <job name="Setting MDNS up">
+ <os family="unix" />
<os family="mac" />
+ <os family="macosx" />
+ <executefile name="$INSTALL_PATH/bin/install_mdns.sh"/>
+ </job>
+ <job name="Setting JSTUN up">
+ <os family="unix" />
+ <os family="mac" />
+ <os family="macosx" />
+ <executefile name="$INSTALL_PATH/bin/install_stun.sh"/>
+ </job>
+ <job name="Setting Librarian up">
+ <os family="unix" />
+ <os family="mac" />
+ <os family="macosx" />
+ <executefile name="$INSTALL_PATH/bin/install_librarian.sh"/>
+ </job>
+
+ <!-- no plugin below that line! -->
+ <job name="Setting Plugins up">
+ <os family="unix" />
+ <os family="mac" />
+ <os family="macosx" />
+ <executefile name="$INSTALL_PATH/bin/install_plugins.sh"/>
+ </job>
+ <job name="Detecting port availability">
+ <os family="unix" />
+ <os family="mac" />
+ <os family="macosx" />
+ <executefile
name="$INSTALL_PATH/bin/detect_port_availability.sh"/>
+ </job>
+ <job name="Downloading freenet-stable-latest">
+ <os family="unix" />
+ <os family="mac" />
+ <os family="macosx" />
+ <executefile
name="$INSTALL_PATH/bin/install_freenet-stable-latest.sh"/>
+ </job>
+ <job name="Downloading freenet-ext">
+ <os family="unix" />
+ <os family="mac" />
+ <os family="macosx" />
+ <executefile name="$INSTALL_PATH/bin/install_freenet-ext.sh"/>
+ </job>
+ <job name="Starting the node up">
+ <os family="unix" />
+ <os family="mac" />
+ <os family="macosx" />
<executefile name="$INSTALL_PATH/bin/1run.sh"/>
</job>
+
+ <!-- Applications now -->
+ <job name="Setting Thaw up">
+ <os family="unix" />
+ <os family="mac" />
+ <os family="macosx" />
+ <executefile name="$INSTALL_PATH/bin/install_thaw.sh"/>
+ </job>
+ <job name="Setting Frost up">
+ <os family="unix" />
+ <os family="mac" />
+ <os family="macosx" />
+ <executefile name="$INSTALL_PATH/bin/install_frost.sh"/>
+ </job>
+ <job name="Setting jSite up">
+ <os family="unix" />
+ <os family="mac" />
+ <os family="macosx" />
+ <executefile name="$INSTALL_PATH/bin/install_jSite.sh"/>
+ </job>
+
+ <!-- Do I have to mention that nothing ought to be below ? -->
+ <job name="Cleaning up">
+ <os family="unix" />
+ <os family="mac" />
+ <os family="macosx" />
+ <executefile name="$INSTALL_PATH/bin/cleanup.sh"/>
+ </job>
+
+ <job name="Downloading required files (windows)">
+ <os family="windows" />
+ <executefile name="$INSTALL_PATH\bin\1run.cmd"/>
+ </job>
</processing>
Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml 2007-04-06 17:35:23 UTC (rev
12543)
+++ trunk/apps/new_installer/install.xml 2007-04-06 18:55:45 UTC (rev
12544)
@@ -28,6 +28,7 @@
<laf name="liquid">
<os family="unix"/>
<os family="mac"/>
+ <os family="macosx"/>
</laf>
</guiprefs>
@@ -147,6 +148,7 @@
<pack name="Unix" id="unix" required="yes" os="unix">
<os family="unix"/>
<os family="mac"/>
+ <os family="macosx"/>
<description>An UNIX specific catch-all
pack</description>
<fileset dir="res/unix/" targetdir="$INSTALL_PATH">
@@ -156,8 +158,21 @@
</fileset>
<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"/>
+ <executable targetfile="$INSTALL_PATH/bin/setup.sh"
type="bin" stage="never"/>
+ <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_thaw.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/cleanup.sh"/>
</pack>
<pack name="UninstallStuff" id="uninstall" required="no">
Modified: trunk/apps/new_installer/res/unix/bin/1run.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/1run.sh 2007-04-06 17:35:23 UTC
(rev 12543)
+++ trunk/apps/new_installer/res/unix/bin/1run.sh 2007-04-06 18:55:45 UTC
(rev 12544)
@@ -3,136 +3,10 @@
INSTALL_PATH="${INSTALL_PATH:-$PWD}"
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\!"
- mv freenet.ini freenet.old.ini
-fi
-# We need the exec flag on /bin
-chmod a+rx bin/* lib/* &>/dev/null
-
-# Tweak freenet.ini before the first startup
-echo "node.updater.enabled=true" > freenet.ini
-if test -e update
-then
- echo "Enabling the auto-update feature"
- echo "node.updater.autoupdate=true" >> freenet.ini
- rm -f update
-fi
-
-PLUGINS=""
-if test -e stun
-then
- echo "Enabling the STUN plugin"
- mkdir plugins &>/dev/null
- PLUGINS="plugins.JSTUN.JSTUN at
file://$INSTALL_PATH/plugins/JSTUN.jar;$PLUGINS"
- java -jar bin/sha1test.jar plugins/JSTUN.jar.url plugins &>/dev/null
- mv plugins/JSTUN.jar.url plugins/JSTUN.jar
- rm -f plugins/JSTUN.jar.url
- rm -f stun
-fi
-
-if test -e mdns
-then
- echo "Enabling the MDNSDiscovery plugin"
- mkdir plugins &>/dev/null
- PLUGINS="plugins.MDNSDiscovery.MDNSDiscovery at
file://$INSTALL_PATH/plugins/MDNSDiscovery.jar;$PLUGINS"
- java -jar bin/sha1test.jar plugins/MDNSDiscovery.jar.url plugins
&>/dev/null
- mv plugins/MDNSDiscovery.jar.url plugins/MDNSDiscovery.jar
- rm -f plugins/MDNSDiscovery.jar.url
- rm -f mdns
-fi
-
-if test -e librarian
-then
- echo "Enabling the Librarian plugin"
- mkdir plugins &>/dev/null
- PLUGINS="plugins.Librarian.Librarian at
file://$INSTALL_PATH/plugins/Librarian.jar;$PLUGINS"
- java -jar bin/sha1test.jar plugins/Librarian.jar.url plugins &>/dev/null
- mv plugins/Librarian.jar.url plugins/Librarian.jar
- rm -f plugins/Librarian.jar.url
- rm -f librarian
-fi
-
-# Register plugins
-echo "pluginmanager.loadplugin=$PLUGINS" >> freenet.ini
-
-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 &>/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
- if test $? -ne 0
- then
- FPROXY_PORT=9999
- echo "Can not bind fproxy to 8889: force it to $FPROXY_PORT
instead."
- fi
- cat welcome.html | sed "s/8888/$FPROXY_PORT/g" >welcome2.html
- mv welcome2.html welcome.html
-fi
-echo -e "fproxy.enabled=true\nfproxy.port=$FPROXY_PORT" >> freenet.ini
-
-# Try to auto-detect the first available port for fcp
-FCP_PORT=9481
-java -jar bin/bindtest.jar $FCP_PORT
-if test $? -ne 0
-then
- FCP_PORT=9482
- echo "Can not bind fcp to 9481: force it to $FCP_PORT instead."
-fi
-echo -e "fcp.enabled=true\nfcp.port=$FCP_PORT" >> freenet.ini
-
-# Try to auto-detect the first available port for console
-CONSOLE_PORT=2323
-java -jar bin/bindtest.jar $CONSOLE_PORT
-if test $? -ne 0
-then
- CONSOLE_PORT=2324
- echo "Can not bind console to 2323: force it to $CONSOLE_PORT instead."
-fi
-echo -e "console.enabled=true\nconsole.port=$CONSOLE_PORT" >> freenet.ini
-
-echo "Downloading freenet-stable-latest.jar"
-java -jar bin/sha1test.jar freenet-stable-latest.jar "$INSTALL_PATH"
&>/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 "$INSTALL_PATH" &>/dev/null || exit
1
-echo "Downloading update.sh"
-java -jar bin/sha1test.jar update/update.sh "$INSTALL_PATH" &>/dev/null ||
exit 1
-chmod a+rx "$INSTALL_PATH/update.sh"
-
# Starting the node up
./run.sh start
-if test -e thaw
-then
- rm -f thaw
- echo "Downloading Thaw"
- java -jar bin/sha1test.jar Thaw/Thaw.jar ./ &>/dev/null || exit 1
-fi
-
-if test -e jsite
-then
- rm -f jsite
- echo "Downloading jSite"
- java -jar bin/sha1test.jar jSite/jSite.jar ./ &>/dev/null || exit 1
-fi
-
-if test -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 "Starting up a browser"
java -cp bin/browser.jar BareBonesBrowserLaunch
"file://$INSTALL_PATH/welcome.html"
Added: trunk/apps/new_installer/res/unix/bin/cleanup.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/cleanup.sh
(rev 0)
+++ trunk/apps/new_installer/res/unix/bin/cleanup.sh 2007-04-06 18:55:45 UTC
(rev 12544)
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+INSTALL_PATH="${INSTALL_PATH:-$PWD}"
+
+cd "$INSTALL_PATH"
+
+# 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
Property changes on: trunk/apps/new_installer/res/unix/bin/cleanup.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh
(rev 0)
+++ trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh
2007-04-06 18:55:45 UTC (rev 12544)
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+INSTALL_PATH="${INSTALL_PATH:-$PWD}"
+
+cd "$INSTALL_PATH"
+
+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 &>/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
+ if test $? -ne 0
+ then
+ FPROXY_PORT=9999
+ echo "Can not bind fproxy to 8889: force it to $FPROXY_PORT
instead."
+ fi
+ cat welcome.html | sed "s/8888/$FPROXY_PORT/g" >welcome2.html
+ mv welcome2.html welcome.html
+fi
+echo -e "fproxy.enabled=true\nfproxy.port=$FPROXY_PORT" >> freenet.ini
+
+# Try to auto-detect the first available port for fcp
+FCP_PORT=9481
+java -jar bin/bindtest.jar $FCP_PORT
+if test $? -ne 0
+then
+ FCP_PORT=9482
+ echo "Can not bind fcp to 9481: force it to $FCP_PORT instead."
+fi
+echo -e "fcp.enabled=true\nfcp.port=$FCP_PORT" >> freenet.ini
+
+# Try to auto-detect the first available port for console
+CONSOLE_PORT=2323
+java -jar bin/bindtest.jar $CONSOLE_PORT
+if test $? -ne 0
+then
+ CONSOLE_PORT=2324
+ echo "Can not bind console to 2323: force it to $CONSOLE_PORT instead."
+fi
+echo -e "console.enabled=true\nconsole.port=$CONSOLE_PORT" >> freenet.ini
Property changes on:
trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/apps/new_installer/res/unix/bin/install_freenet-ext.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_freenet-ext.sh
(rev 0)
+++ trunk/apps/new_installer/res/unix/bin/install_freenet-ext.sh
2007-04-06 18:55:45 UTC (rev 12544)
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+INSTALL_PATH="${INSTALL_PATH:-$PWD}"
+
+cd "$INSTALL_PATH"
+
+echo "Downloading freenet-ext.jar"
+java -jar bin/sha1test.jar freenet-ext.jar "$INSTALL_PATH" &>/dev/null || exit
1
Property changes on:
trunk/apps/new_installer/res/unix/bin/install_freenet-ext.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh
(rev 0)
+++ trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh
2007-04-06 18:55:45 UTC (rev 12544)
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+INSTALL_PATH="${INSTALL_PATH:-$PWD}"
+
+cd "$INSTALL_PATH"
+
+echo "Downloading freenet-stable-latest.jar"
+java -jar bin/sha1test.jar freenet-stable-latest.jar "$INSTALL_PATH"
&>/dev/null || exit 1
+ln -s freenet-stable-latest.jar freenet.jar
Property changes on:
trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/apps/new_installer/res/unix/bin/install_frost.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_frost.sh
(rev 0)
+++ trunk/apps/new_installer/res/unix/bin/install_frost.sh 2007-04-06
18:55:45 UTC (rev 12544)
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+INSTALL_PATH="${INSTALL_PATH:-$PWD}"
+
+cd "$INSTALL_PATH"
+
+if test -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
Property changes on: trunk/apps/new_installer/res/unix/bin/install_frost.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/apps/new_installer/res/unix/bin/install_jSite.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_jSite.sh
(rev 0)
+++ trunk/apps/new_installer/res/unix/bin/install_jSite.sh 2007-04-06
18:55:45 UTC (rev 12544)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+INSTALL_PATH="${INSTALL_PATH:-$PWD}"
+
+cd "$INSTALL_PATH"
+
+if test -e jsite
+then
+ rm -f jsite
+ echo "Downloading jSite"
+ java -jar bin/sha1test.jar jSite/jSite.jar ./ &>/dev/null || exit 1
+fi
Property changes on: trunk/apps/new_installer/res/unix/bin/install_jSite.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/apps/new_installer/res/unix/bin/install_librarian.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_librarian.sh
(rev 0)
+++ trunk/apps/new_installer/res/unix/bin/install_librarian.sh 2007-04-06
18:55:45 UTC (rev 12544)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+INSTALL_PATH="${INSTALL_PATH:-$PWD}"
+
+cd "$INSTALL_PATH"
+
+if test -e librarian
+then
+ echo "Enabling the Librarian plugin"
+ mkdir plugins &>/dev/null
+ PLUGINS=`cat plug`
+ echo "plugins.Librarian.Librarian at
file://$INSTALL_PATH/plugins/Librarian.jar;$PLUGINS" > plug2
+ mv -f plug2 plug
+ java -jar bin/sha1test.jar plugins/Librarian.jar.url plugins &>/dev/null
+ mv plugins/Librarian.jar.url plugins/Librarian.jar
+ rm -f plugins/Librarian.jar.url
+ rm -f librarian
+fi
Property changes on: trunk/apps/new_installer/res/unix/bin/install_librarian.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/apps/new_installer/res/unix/bin/install_mdns.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_mdns.sh
(rev 0)
+++ trunk/apps/new_installer/res/unix/bin/install_mdns.sh 2007-04-06
18:55:45 UTC (rev 12544)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+INSTALL_PATH="${INSTALL_PATH:-$PWD}"
+
+cd "$INSTALL_PATH"
+
+if test -e mdns
+then
+ echo "Enabling the MDNSDiscovery plugin"
+ mkdir plugins &>/dev/null
+ PLUGINS=`cat plug`
+ echo "plugins.MDNSDiscovery.MDNSDiscovery at
file://$INSTALL_PATH/plugins/MDNSDiscovery.jar;$PLUGINS" > plug2
+ mv -f plug2 plug
+ java -jar bin/sha1test.jar plugins/MDNSDiscovery.jar.url plugins
&>/dev/null
+ mv plugins/MDNSDiscovery.jar.url plugins/MDNSDiscovery.jar
+ rm -f plugins/MDNSDiscovery.jar.url
+ rm -f mdns
+fi
Property changes on: trunk/apps/new_installer/res/unix/bin/install_mdns.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/apps/new_installer/res/unix/bin/install_plugins.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_plugins.sh
(rev 0)
+++ trunk/apps/new_installer/res/unix/bin/install_plugins.sh 2007-04-06
18:55:45 UTC (rev 12544)
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+INSTALL_PATH="${INSTALL_PATH:-$PWD}"
+
+cd "$INSTALL_PATH"
+
+# Register plugins
+echo "pluginmanager.loadplugin=`cat plug`" >> freenet.ini
+
+# Cleanup
+rm -f plug plug2
Property changes on: trunk/apps/new_installer/res/unix/bin/install_plugins.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/apps/new_installer/res/unix/bin/install_stun.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_stun.sh
(rev 0)
+++ trunk/apps/new_installer/res/unix/bin/install_stun.sh 2007-04-06
18:55:45 UTC (rev 12544)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+INSTALL_PATH="${INSTALL_PATH:-$PWD}"
+
+cd "$INSTALL_PATH"
+
+if test -e stun
+then
+ echo "Enabling the STUN plugin"
+ mkdir plugins &>/dev/null
+ PLUGINS=`cat plug`
+ echo "plugins.JSTUN.JSTUN at
file://$INSTALL_PATH/plugins/JSTUN.jar;$PLUGINS" > plug2
+ mv -f plug2 plug
+ java -jar bin/sha1test.jar plugins/JSTUN.jar.url plugins &>/dev/null
+ mv plugins/JSTUN.jar.url plugins/JSTUN.jar
+ rm -f plugins/JSTUN.jar.url
+ rm -f stun
+fi
Property changes on: trunk/apps/new_installer/res/unix/bin/install_stun.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/apps/new_installer/res/unix/bin/install_thaw.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_thaw.sh
(rev 0)
+++ trunk/apps/new_installer/res/unix/bin/install_thaw.sh 2007-04-06
18:55:45 UTC (rev 12544)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+INSTALL_PATH="${INSTALL_PATH:-$PWD}"
+
+cd "$INSTALL_PATH"
+
+if test -e thaw
+then
+ rm -f thaw
+ echo "Downloading Thaw"
+ java -jar bin/sha1test.jar Thaw/Thaw.jar ./ &>/dev/null || exit 1
+fi
Property changes on: trunk/apps/new_installer/res/unix/bin/install_thaw.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/apps/new_installer/res/unix/bin/install_updater.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_updater.sh
(rev 0)
+++ trunk/apps/new_installer/res/unix/bin/install_updater.sh 2007-04-06
18:55:45 UTC (rev 12544)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+INSTALL_PATH="${INSTALL_PATH:-$PWD}"
+
+cd "$INSTALL_PATH"
+
+# Tweak freenet.ini before the first startup
+echo "node.updater.enabled=true" > freenet.ini
+if test -e update
+then
+ echo "Enabling the auto-update feature"
+ echo "node.updater.autoupdate=true" >> freenet.ini
+ rm -f update
+fi
+
+echo "Downloading update.sh"
+java -jar bin/sha1test.jar update/update.sh "$INSTALL_PATH" &>/dev/null ||
exit 1
+chmod a+rx "$INSTALL_PATH/update.sh"
Property changes on: trunk/apps/new_installer/res/unix/bin/install_updater.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/apps/new_installer/res/unix/bin/setup.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/setup.sh
(rev 0)
+++ trunk/apps/new_installer/res/unix/bin/setup.sh 2007-04-06 18:55:45 UTC
(rev 12544)
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+INSTALL_PATH="${INSTALL_PATH:-$PWD}"
+
+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\!"
+ mv freenet.ini freenet.old.ini
+fi
+
+# Hack to use a generic template for plugins
+touch plug
+
+# We need the exec flag on /bin
+chmod u+x bin/*sh bin/wrapper-* lib/* &>/dev/null
Property changes on: trunk/apps/new_installer/res/unix/bin/setup.sh
___________________________________________________________________
Name: svn:executable
+ *
