merge of '3b23dcff9410a7f2e8443cdaa410ead6d9694f29'

and 'fd87a1b95a60a0e5c18d75aed057344e8ce5aa87'

installer/install.xml

@@ -85,6 +85,7 @@
         <res id="InfoPanel.info" src="installer/resources/readme.license.txt"/>
         <!-- <res id="ProcessPanel.Spec.xml" src="installer/resources/ProcessPanel.Spec.xml"/> -->
 	<res id="shortcutSpec.xml" src="installer/resources/shortcutSpec.xml" />
+	<res id="XInfoPanel.info" src="installer/resources/start-i2p.txt" />
     </resources>
 
     <panels>
@@ -94,6 +95,7 @@
         <panel classname="InstallPanel"/>
         <panel classname="ShortcutPanel"><os family="windows" /></panel>
         <!-- <panel classname="ProcessPanel"><os family="windows" /></panel> -->
+        <panel classname="XInfoPanel" ><os family="unix|mac" /></panel>
         <panel classname="SimpleFinishPanel"/>
     </panels>
 

installer/resources/postinstall.sh

@@ -74,6 +74,7 @@ rm -f ./lib/*.dll
 rm -f ./*.bat
 rm -f ./*.exe
 rm -rf ./installer
-./i2prouter start
+# no, let's not start the router from the install script any more
+# ./i2prouter start
 exit 0
 

installer/resources/start-i2p.txt

@@ -0,0 +1 @@
+To start I2P, run "$INSTALL_PATH/i2prouter start"