Author: nextgens
Date: 2008-09-01 22:43:40 +0000 (Mon, 01 Sep 2008)
New Revision: 22328
Added:
trunk/apps/new_installer/res/unix/bin/install_keyexplorer.sh
trunk/apps/new_installer/res/unix/bin/install_thawindexbrowser.sh
Modified:
trunk/apps/new_installer/ProcessPanel.Spec.xml
trunk/apps/new_installer/install.xml
trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
Log:
new_installer: bundle both KeyExplorer and ThawBrowserIndex
Modified: trunk/apps/new_installer/ProcessPanel.Spec.xml
===================================================================
--- trunk/apps/new_installer/ProcessPanel.Spec.xml 2008-09-01 22:23:28 UTC
(rev 22327)
+++ trunk/apps/new_installer/ProcessPanel.Spec.xml 2008-09-01 22:43:40 UTC
(rev 22328)
@@ -51,6 +51,16 @@
<os family="mac"/>
<executefile name="$INSTALL_PATH/bin/install_librarian.sh"/>
</job>
+ <job name="Setting KeyExplorer up">
+ <os family="unix"/>
+ <os family="mac"/>
+ <executefile name="$INSTALL_PATH/bin/install_keyexplorer.sh"/>
+ </job>
+ <job name="Setting ThawIndexBrowser up">
+ <os family="unix"/>
+ <os family="mac"/>
+ <executefile
name="$INSTALL_PATH/bin/install_thawindexbrowser.sh"/>
+ </job>
<!-- no plugin below that line! -->
<job name="Setting plugins up">
Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml 2008-09-01 22:23:28 UTC (rev
22327)
+++ trunk/apps/new_installer/install.xml 2008-09-01 22:43:40 UTC (rev
22328)
@@ -271,6 +271,16 @@
<description>A plugin allowing you to search the
freenet.</description>
<singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/xmllibrarian"/>
</pack>
+
+ <pack name="KeyExplorer" id="keyexplorer" required="no"
parent="plugins">
+ <description>A plugin allowing you to "view" the
content of freenet keys including metadatas.</description>
+ <singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/keyexplorer"/>
+ </pack>
+
+ <pack name="ThawIndexBrowser" id="thawindexbrowser"
required="no" parent="plugins">
+ <description>A plugin allowing you to "view" the
content of thaw indexes from FProxy.</description>
+ <singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/thawindexbrowser"/>
+ </pack>
</packs>
<!-- The native libraries to add
http://svn.berlios.de/svnroot/repos/izpack/izpack-src/trunk/src/native/ -->
Added: trunk/apps/new_installer/res/unix/bin/install_keyexplorer.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_keyexplorer.sh
(rev 0)
+++ trunk/apps/new_installer/res/unix/bin/install_keyexplorer.sh
2008-09-01 22:43:40 UTC (rev 22328)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+. "$HOME/_install_toSource.sh" || exit 0
+cd "$INSTALL_PATH"
+
+if test -f keyexplorer -a -f plug
+then
+ echo "Enabling the KeyExplorer plugin"
+ if test ! -d plugins; then mkdir plugins; fi 2>&1 >/dev/null
+ PLUGINS="`cat plug`"
+ echo "KeyExplorer;$PLUGINS" > plug2
+ mv -f plug2 plug
+ if test ! -f offline
+ then
+ java $JOPTS -jar bin/sha1test.jar KeyExplorer.jar plugins
"$CAFILE" >/dev/null 2>&1
+ fi
+ rm -f keyexplorer
+fi
Property changes on:
trunk/apps/new_installer/res/unix/bin/install_keyexplorer.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/apps/new_installer/res/unix/bin/install_thawindexbrowser.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_thawindexbrowser.sh
(rev 0)
+++ trunk/apps/new_installer/res/unix/bin/install_thawindexbrowser.sh
2008-09-01 22:43:40 UTC (rev 22328)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+. "$HOME/_install_toSource.sh" || exit 0
+cd "$INSTALL_PATH"
+
+if test -f thawindexbrowser -a -f plug
+then
+ echo "Enabling the ThawIndexBrowser plugin"
+ if test ! -d plugins; then mkdir plugins; fi 2>&1 >/dev/null
+ PLUGINS="`cat plug`"
+ echo "ThawIndexBrowser;$PLUGINS" > plug2
+ mv -f plug2 plug
+ if test ! -f offline
+ then
+ java $JOPTS -jar bin/sha1test.jar ThawIndexBrowser.jar plugins
"$CAFILE" >/dev/null 2>&1
+ fi
+ rm -f thawindexbrowser
+fi
Property changes on:
trunk/apps/new_installer/res/unix/bin/install_thawindexbrowser.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
2008-09-01 22:23:28 UTC (rev 22327)
+++ trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
2008-09-01 22:43:40 UTC (rev 22328)
@@ -45,5 +45,23 @@
@del /F xmllibrarian > NUL
:nolibrarian
+ at if not exist keyexplorer goto nolibrarian
+ at echo -KeyExplorer
+ at set PLUGINS=KeyExplorer;%PLUGINS%
+ at if exist offline goto end4
+ at java -jar bin\sha1test.jar KeyExplorer.jar plugins %CAFILE% > NUL
+:end4
+ at del /F keyexplorer > NUL
+:nokeyexplorer
+
+ at if not exist thawindexbrowser goto nolibrarian
+ at echo -ThawIndexBrowser
+ at set PLUGINS=ThawIndexBrowser;%PLUGINS%
+ at if exist offline goto end4
+ at java -jar bin\sha1test.jar ThawIndexBrowser.jar plugins %CAFILE% > NUL
+:end4
+ at del /F thawindexbrowser > NUL
+:nothawindexbrowser
+
@echo pluginmanager.loadplugin=%PLUGINS% >> freenet.ini
:end
