Author: nextgens
Date: 2008-06-04 17:16:18 +0000 (Wed, 04 Jun 2008)
New Revision: 20201
Added:
trunk/apps/new_installer/res/unix/bin/install_firefox_profile.sh
trunk/apps/new_installer/res/windows/bin/install_firefox_profile.cmd
Modified:
trunk/apps/new_installer/ProcessPanel.Spec.xml
trunk/apps/new_installer/install.xml
Log:
new_installer: download the firefox profile instead of bundling it
Modified: trunk/apps/new_installer/ProcessPanel.Spec.xml
===================================================================
--- trunk/apps/new_installer/ProcessPanel.Spec.xml 2008-06-04 16:27:42 UTC
(rev 20200)
+++ trunk/apps/new_installer/ProcessPanel.Spec.xml 2008-06-04 17:16:18 UTC
(rev 20201)
@@ -80,6 +80,15 @@
<os family="windows"/>
<executefile name="$INSTALL_PATH\bin\install_freenet-ext.cmd"/>
</job>
+ <job name="Downloading the firefox profile">
+ <os family="unix"/>
+ <os family="mac"/>
+ <executefile
name="$INSTALL_PATH/bin/install_firefox_profile.sh"/>
+ </job>
+ <job name="Downloading the firefox profile">
+ <os family="windows"/>
+ <executefile
name="$INSTALL_PATH\bin\install_firefox_profile.cmd"/>
+ </job>
<job name="Detecting port availability">
<os family="unix"/>
<os family="mac"/>
Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml 2008-06-04 16:27:42 UTC (rev
20200)
+++ trunk/apps/new_installer/install.xml 2008-06-04 17:16:18 UTC (rev
20201)
@@ -115,7 +115,6 @@
<exclude name="*/**/.svn"/>
<exclude name="*/**/.svn/**"/>
<include name="bin/**/*"/>
- <include name="firefox_profile/**/*"/>
<include name="wrapper.conf"/>
<include name="startssl.pem"/>
<include name="dont-close-me.html"/>
@@ -229,6 +228,11 @@
<parsable
targetfile="$INSTALL_PATH/bin/remove_cronjob.sh"/>
</pack>
+ <pack name="Firefox Profile" id="firefox_profile"
required="yes" parent="base">
+ <description>Sets a customized firefox profile up for
freenet browsing. Strongly recommended.</description>
+ <singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/firefox_profile.install"/>
+ </pack>
+
<pack name="Plugins" id="plugins" required="no">
<description>A set of plugins for freenet
nodes</description>
</pack>
Added: trunk/apps/new_installer/res/unix/bin/install_firefox_profile.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_firefox_profile.sh
(rev 0)
+++ trunk/apps/new_installer/res/unix/bin/install_firefox_profile.sh
2008-06-04 17:16:18 UTC (rev 20201)
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+. "$HOME/_install_toSource.sh"|| exit 0
+cd "$INSTALL_PATH"
+
+if test -e firefox_profile.install
+then
+ echo "Downloading the custom firefox profile"
+ if test ! -e offline
+ then
+ java $JOPTS -jar bin/sha1test.jar firefox_profile.zip .
"$CAFILE" >/dev/null 2>&1 || exit 1
+ fi
+ mkdir -p firefox_profile
+ java $JOPTS -jar bin/uncompress.jar firefox_profile.zip firefox_profile
2>&1 >/dev/null
+ rm -f firefox_profile.install
+fi
Property changes on:
trunk/apps/new_installer/res/unix/bin/install_firefox_profile.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/apps/new_installer/res/windows/bin/install_firefox_profile.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_firefox_profile.cmd
(rev 0)
+++ trunk/apps/new_installer/res/windows/bin/install_firefox_profile.cmd
2008-06-04 17:16:18 UTC (rev 20201)
@@ -0,0 +1,17 @@
+ at set PATH=%SYSTEMROOT%\System32\;%PATH%
+ at set INSTALL_PATH=$INSTALL_PATH
+ at set JAVA_HOME=$JAVA_HOME
+ at set CAFILE=startssl.pem
+ at cd /D %INSTALL_PATH%
+ at if exist .isInstalled goto end
+
+ at if not exist firefox_profile.install goto end
+ at echo Downloading the firefox profile
+ at if exist offline goto end1
+ at java -jar bin\sha1test.jar firefox_profile.zip . %CAFILE% > NUL
+:end1
+ at mkdir firefox_profile 2> NUL
+ at java -jar bin\uncompress.jar firefox_profile.zip firefox_profile > NUL
+ at del /F firefox_profile.install > NUL
+
+:end
