merge of '06b8a711c60dbb6a9d628c4c5ffd8b205176271a'

     and 'c1edfeadb75181e65ad8d4c0005b861f3563dd5b'

installer/install.xml

@@ -132,10 +132,10 @@
               and the izpack docs for some guidance.
              -->
             <parsable targetfile="$INSTALL_PATH/wrapper.config" type="plain" />
-            <parsable targetfile="$INSTALL_PATH/i2prouter" type="shell" os="unix|mac" />
-            <parsable targetfile="$INSTALL_PATH/eepget" type="shell" os="unix|mac" />
+            <parsable targetfile="$INSTALL_PATH/i2prouter" type="shell" os="unix" />
+            <parsable targetfile="$INSTALL_PATH/eepget" type="shell" os="unix" />
             <parsable targetfile="$INSTALL_PATH/eepget.bat" type="shell" os="windows" />
-            <parsable targetfile="$INSTALL_PATH/runplain.sh" type="shell" os="unix|mac" />
+            <parsable targetfile="$INSTALL_PATH/runplain.sh" type="shell" os="unix" />
             <parsable targetfile="$INSTALL_PATH/Start I2P Router.app/Contents/MacOS/i2prouter" type="shell" os="mac" />
             
 	    <conditions>