diff --git a/build.xml b/build.xml
index cc58ef36b2..0758c4c32a 100644
--- a/build.xml
+++ b/build.xml
@@ -185,7 +185,7 @@
-
+
@@ -228,7 +228,7 @@
-
+
diff --git a/history.txt b/history.txt
index 85f55cab52..085c7e3991 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,14 @@
-$Id: history.txt,v 1.12 2004/09/07 17:13:12 jrandom Exp $
+$Id: history.txt,v 1.13 2004/09/08 02:25:09 hypercubus Exp $
+
+2004-09-07 hypercubus
+ * Bugfix: Running the installer as a non-privileged user on Red Hat (and
+ hopefully any other affected *nix systems) now properly discards non-
+ essential directories after installation.
+ * Support for Win9x in the installer and postinstall.bat.
+ * Changed the name of the default installation directory on all platforms
+ from "I2P" to "i2p" in the installer.
+ * Changed "wrapper.conf" to "wrapper.config" for naming consistency with the
+ other configuration files.
2004-09-07 cervantes:
* Proxy recursion disabled by default (strict)
diff --git a/hosts.txt b/hosts.txt
index c8988b7e47..0b0ba7a23b 100644
--- a/hosts.txt
+++ b/hosts.txt
@@ -1,9 +1,6 @@
; TC's hosts.txt guaranteed freshness
-; $Id: hosts.txt,v 1.41 2004/09/08 02:45:11 sunshine Exp $
+; $Id: hosts.txt,v 1.39 2004/09/07 17:30:53 hypercubus Exp $
; changelog:
-; (1.67) added eepdot.i2p
-; (1.66) removed datagram_test.i2p
-; (1.65) added socks1.tor.i2p
; (1.64) added sugadude.i2p
; (1.63) added files.i2p
; (1.62) added beyond.i2p
@@ -142,6 +139,7 @@ freshcoffee.i2p=bljvyRLSf2lCPJYJ49iGJ7RxTppQfJHh0UviwxeFUwfznUYZ3nnVZhqDKtfKLSt8
stasher.i2p=WsfNc~1sP-eCU5XRoPoyYFwJZ-BrrN29rs89fYAs2kFIyCbsKYeA9rYbD3O1sFCD~kLUC1DELoTwQlHas7JkDkEPXO1plDjzKm8l1iTsPyQmeEVW2Uy6LXOibT6FsdIfoh59G4yfCsEZ~dsxtZZR2ICDb3sRKC8Vx9lZOz72AfBATYQ0S2oQd2iVAjIb0wC0HaVw1XOqhKCmMjWtQhT0qxtkx7ky9ZG1ZAhKeCX4SkCy5YvGeUuCWgPpFLR6D3Hn074Qmtg8g1nAFhlsZ2NiY2OSwNtVM3f2lL6~l4O~xi5oOV7OAtQr5tKywa0SC53hJAAk2VI6HwiexTEwswnaSYwlyW47pO-onpc3sguCmbBWHbxJDzCE5eoi8iFGOH~Awl~ieI6vkvPnGtjvXM4t0jDe3FnrbYCZeSqToKOgIYz0f8iVVbSsh7UVdSepN5tIL~ljIoZIiG6VH37H1ju4loRiADr2wyWWlI94YvZB8rmgUHTPuE9YCijVwmXQNky5AAAA
brittanyworld.i2p=tJaK0vA6NNBjyGTjGqHr4k9005aiRToLxP~LIA-WXrjRaWgglh6s8CuE8o60i6i~isELPMAZJGSdPNAP~d2OVEOVu9yXom8xpQyX~xc8gVOhTXi3PvjlCDcG09mFfzPm3XJFJR00EkBcfa2ssaXqOX3vXiR-aGdObmCBngNHeh0sgUJTnfOKFUXRN1leXdWj9ADBPk2iCEvLM7Rrt-vFdr0slrIY0ILzBBK65fZenZtf5QQwskyBeLljpUBbTo21tCSUs89U6yXheYiakR3cQgTDbr9MrcRv8bWiNCKRnoVb5HVrPFZZDk5zCvpMK-zV7YmoO0qYK2AWgnGGZ2PI4ycL7sAHZ~QJixw~7UYtslrisMHKbWAvZfRf4MwFhbKH9RVb2ft2vtSXOz5h7lXtVpPv-xeqoJlclBSLYNt5Ji1iZuFOJFEnjUc3WhSFDph2Tz72PkyU-qXoydrv~JQK7kY5GpjDZ2whqrHjk4ceyQs4jTRfpwbkt~qrQ7AzKnpkAAAA
files.nickster.i2p=C-A1MrwV~WC3ld5mDKW57EpaFmIUv5LQThPL~OAOE63Psej8GhH-m61P3yII0NxVJrkKcTa3CZfnPkQCVXkTD2gv2qpZuiX3j4vGJFuQYByKwzuTJ7Ucff9XeO9A~kaXFg9JwMmkzHJZ37X~tKIr-EfHA23mMmUrvmsemAkCOxTHPab33WEkQgBPfTfL9BOSaEzG362OerU7O2QBWjDHrAoMBztHOx4s61pSKMDky71o2fTi4TgoVcOL1oRzprsf5BV9BiY5TRtY7uvYp7-93uct0EAVu686IrM~RzqGuHhSm9TGtEFC6UyMMcn6dxD7q6srI-kR807umEUO8ILNCF79pVZWmA0sBN16wyq-~LtX45dun0UFKDiYyJXcrdN9wyRkro3oZImjW0bLxP5YhMw1C8HhTBSWhDmuJVucZByWqM~Es9pSVql1NX0EU96iqFtWHOEbw9XoT~eBhnqYdQ-PnB79wFWaFFxq-0X89FqxEvl79R7Nqjb46BEkzjoQAAAA
+datagram_test.i2p=8iJSGzSY8BOFcGohooX94PWiRB3VZYPmLfSBorLTzVC3tmviLcEngN8e8U9kuVTxiQ7Za6HMESzzgnZvKOmL2jD~yon5zNGDShICJv134bX7odSzqbFG5xwpfwRJ8jQvUEnS0bg3BCfK9vmVnqpixd~8qnGThr5KzQxXfI72NcQYlbszp2BOLhGjxDFh5fQpy6Vm8d1R4GF4RGGTaKXANQ9I49LND10xYNE9BayxrUQrkzCDMMI1JXyoR2N~WwuoFK3RzKSrSTMcGbZpZgLZjo47jSqD9ssJPcD94hAllTtk5iTajLhXhoSCFSzpyrAxuRxhHEl8OKIxaNA5DqZMLo7KqfrwSkyRvUyqeFXnzz8DZq8YXu9GeXzkzPhnQdFEiOSV6ypJndv7rVJ1ccarDLdbxEBFZgl4LUux-Aemt4FfuNOvnKzr3OdOX4eT8TvO0kQKwA4NLs0noqiHMzDSUijNGtHv0npvMgT9dO~UIxLHV~sYqIl4t58bSTqJWRATAAAA
firerabbit.i2p=LKJIXNQIeR8axYRjcneFIBBWEUbvqMpgQbcc5-QRXLzB49ypTR3o7cx~7iJKxQP~WY~sL-lAnbvl8HmyJa9AOurV4rVBcxGCSLdb7A2pLCmS-WAOP76Nr4ncQFegjRuzDf015QfsXhJq6F~trAisEI6JIIcjOn4ArWFA~cboLPh75GurFNLBE8zegREAjk3bureR3C2ND5KDxz618gzKj0kS6rGwZPcUsrwyiefNrokaWtCuTNQd9Pw-myN6yoYh9UsdAWY2yOXkupGCTjKHXxEgBYg09w6fsHU7I-kg5cFqrmnmFhLWMd3gSmE~ziuHCqacd8uOtJbzxLIEoaUZmCiA1swrrKnIvRMkmW0WxS0XxBwwDLsZSXymAuVcpCUpwshZ9m7eLzSSrhV7Oii4jk~Y49XqfwHzBU2HoHlSsrTV7vydtsdN6j4W-FO1xd2-wUcvQyTqiHINPpl92dOWfsO0OdQYaB5tdq74cXMFXtO1y-vH86u2nJMECZg-mfWDAAAA
lucky.i2p=E8BejPR-eZzUIkyMNfNJ-qZ97H9Ym9OXPS0PIFR-C7xlljf-aniVbnp8KUvEuCeC1c4Zk4tihOEYCx54y1svpk3GXjrAJ3-3-i92xgUPXNa0lWkV7JELmsfoK0ZsByZzxg4Jjl4dNe9PgT8CEwHrJqNZGKn5MzTm66PbXBS96zK7ApRU5d3ZzQepmTAcvI2VgqueYhkFNG3DT6C5vVnFsPcLq9uuWtSyDot6egDKvkGv8O3AvvMhOFFs4DX3C3L2YOedu01YwAXL9zCi7gs9jpDG9YuYDCM1xsiNfgvZG36bDeqmviG6RiT3gvEuypUfWbVsU9uBnHiyu4CoMVpgGEei0PrYJqeioLwja97w~PR8jRg-psdWQco7JS~rohcHuuflClLlW6oKkwgJFayjvYN0Uj5Os~SH-t9vIEVz5OGge16UK9i1jfItKzFiyggGTVeDH9mL3Dl7pkZufOf7ywbl6URnzlgRick6awNYFQwamrF5gQ~F~eKPyN7dNIbnAAAA
www.i2p=Nf3ab-ZFkmI-LyMt7GjgT-jfvZ3zKDl0L96pmGQXF1B82W2Bfjf0n7~288vafocjFLnQnVcmZd~-p0-Oolfo9aW2Rm-AhyqxnxyLlPBqGxsJBXjPhm1JBT4Ia8FB-VXt0BuY0fMKdAfWwN61-tj4zIcQWRxv3DFquwEf035K~Ra4SWOqiuJgTRJu7~o~DzHVljVgWIzwf8Z84cz0X33pv-mdG~~y0Bsc2qJVnYwjjR178YMcRSmNE0FVMcs6f17c6zqhMw-11qjKpY~EJfHYCx4lBWF37CD0obbWqTNUIbL~78vxqZRT3dgAgnLixog9nqTO-0Rh~NpVUZnoUi7fNR~awW5U3Cf7rU7nNEKKobLue78hjvRcWn7upHUF45QqTDuaM3yZa7OsjbcH-I909DOub2Q0Dno6vIwuA7yrysccN1sbnkwZbKlf4T6~iDdhaSLJd97QCyPOlbyUfYy9QLNExlRqKgNVJcMJRrIual~Lb1CLbnzt0uvobM57UpqSAAAA
@@ -151,7 +149,4 @@ linuxagent.i2p=OE-WAF6jzHUbUF7eytgiIaIKWh~oGf3c8~q-fUBbM2WntbXO7AhpU0QmZ~1lZIiQf
gott.i2p=BxciUZkGQwi6Sj1Ucg5GGagDdwujlj8ClePa4~3d-1nnRJsBhTNJtvs-UuQYY77gPGNlpNk9dt02mxeS7f~pEC4E1KxJH9mhnf0OlIGB4hOOhDlXokAaKE2u1E-vVCDJlZCq32r~Ne53w-L2m5h5FAq5Bx7NXrTzWAEPgAlC8A2wASJWIF-EKOX5kfkkYoF6sKZqam5CxAAAMAUwmnbD--7wo8d2mz0C-c~oE7hzuHsg2J8yME5Zd~-FOZUxkoNCBJdfrVlVRn9~6685zqpaotL-SIqFK6~28ZCNMNCtnZcZZLeG2gZxq2pe8HtgzDrMMSx45vs3JLUp8Bap6~D9oFX0o7k2DQm-5R9D5NWhsJgol5Ny~8ABTXBpW~WQQOuKxE5xJauXM5rQia2yyXgldfOyGjxYnkrTGu6LaxlLmhyAva3ZbOO0mtLvrKLZebLKCYUxP7~TtNmSWEAzPKFYbjdZ~NjE0q4TanLFBaWotefPmy3IuAc8Mr7PbCvi4GmdAAAA
beyond.i2p=Gy9wxnDgcaNO8b-1gZTAn4GKWiMZHLSuOpXF9SSrVVO5Gx791OwZVNg9mMHvIkSekWuqtJwIRCArfXtaQNNe4ZJfl2bVNEKJonfXM9HLbNoJiSgmg-x75xYLXb04NDYhIbHJ4zSEpDFufjk1kI35XJo~32~qYynDMbYX9b3QtNfFfcBrOzH5iObTsMBBe5f2zEpjl1UWNGuKYa1tVHef65z6WCr16TUYSj5uDnUyTWWkwrgDZbTnRRlz--BQ9y4WiCgzQyMvRaNU-T6aPj6P9HlQIhV7efttpb2IRLpSKepIYG66ohBhI1n2G2dd18UHdR~PWNIy8x7AsCczlqnfh4lcJdiQqrNHQtpOI3XfM5gLM5sKLwrxbsQwB-6dnhonztTd1o9TWhTuA1FSlk3nRQ22E1~pQRh0sexgWjk1oa0Qr6kOojkY955aL6ZnD7RJx3fbeZ9JAy6s5uxYXuE1wkGQNUVEvi15jgVB8zk4GaB8ME6tdWVtcBTMjEqvulyEAAAA
files.i2p=1rI0OWp83VhVRyMiZkPmw~mEo-CVu548n4uJLsHJW4eNzQfQ~k8SSFGCMc0-YmOW8zvB1AmO1~hTy9qrT4-5rkVxvy7XTwK9-Mvb8N9fKvxr89yBitQvBwhsRKNScMBcV-qsauGd1F~wV~eb0BFjfZG2pyB~-AYuqZrqmoEf48Q~aXn5IKnIXkb8RmKbJNAws3opW3Tvbb-cHMhth3noc9QEpCJzzPZ6~hjjh0FTcPFiFAgaRIL81YcSfMTG7eTg2X20~5j4Em4GY6n8zHw6S5hbBuSMp~udmz11Bvc3QMcbfPMYhMxGMaqWUN8yN3kJwjk8griosz0o6XE~NcUvVXKZELW7jNmURd5e2a-zkSwjlOzoRi3OQhdeGypbUM0c-0-2OxOMJM~yw0bRingvRHT02Xr11nhyZRbysSMxFfxMY5doNKvJk~H7XhCaXCn0LtP7pd9JU9NPKzxIqbP8W0dZFP8C217yRmAHTfxbMmuYaQZenEkWmUVqlTyO-4NBAAAA
-sugadude.i2p=PIV8bZaIH4wRqzlzVLX1mDkELhLFdyLlKxcd2nUrJvd0YeTByls6LGFZ7wr0-9MT7cb3Ee23U1BApgm0~jT5bzFGIQOvx7AT8o0uMy~fcP1lhzo4lNwD5bHnf9OXe59FzORC3s79bwFmTtMCrEoYvQXCGherxwFfXywRPrJ2x0AjfjungiwX3vrndMdol1SDWTLdxTSARLPgLmswz47gGm4dOipjHBSGOm5bdgZBD6di8YGxHrB072QfXxBVSGzTgtQNnK4qAsZv1YbETk2CQ1nOKpCj0Zjkcnc1trTFOpUQKeOp6kiGCriAn8Ezbu1yuf2fiDAmPenFf8bDR7fNFR7kMDcKsbiht7fFi0wjPdE4Lx5H2PFyTuiw3~-osNsXFLtjvaeIV4P99vZRof1avADgp5k4pC8fEPKWfwXGPPFJjYEbWPE4VxmxcP93Iq-CMZfSd8fPeZNeBz8qL~n9IXJoXjO0G3nouQ7d1ZF4okVRO8FmZ91Umpy79v2I4sYFAAAA
-socks1.tor.i2p=sl3oda7CJe3TN1JVoALIuoRAe--qYgDwo0A8PrUGaaWQ2xXiWYaTV7~FQOmv13JRCtbO-8rhOfGWnV-qia4CtRxH6nR6fytW~uJKRP4hbjhfvBuS1QdX2GwWlbgJdV8VT3OpJAe5iuKYCFnnSbVG2VZajtsoKJxHY748h1zhIh4YaMBGqoodQJrnvYWd4HJJ-ZauE-s-K2zWOTJ-EKZNp9UZr5DWDV3P5JTSruc7vyKiDVFra~-JT8mjnWBE9GKy1HiJKAe2UyKHBVjvJ9iL4bJ3HLH-z3oIP5KmW7s4czTq2fdO7yhssLMKxaGqhzsNViWv8FtvLJtHkTsprVQBeS2Eeqiw3iwcC4DGP4dUkj2Ex7DPqvxlA58Df0INgNz-kUPuURf0ZSK45v-s7F0f03BbwIu5eErLZhQckxs9tX6twSPXk2RaceOMA0-eKlbCh3FcpbFbfcimjOTcmpeUN7s-7C-XfM1vazIaIpTADwzZ9Ocs5TV~CU8TPyxZkx8FAAAA
-eepdot.i2p=IXWmPK6689w4d2j-B-zQRdgG6md6UdvDZz9e3MnEWaoU7SiHk8Yrw4-2MSavhycFDkQNdpdJgYVhK0Ve8aF4TNf88KdI5SY4nl079CrjhTaNoQiUxOTJIUzTWGrDmNITfoV7PAjGWoMjw5dOcbK~PMpMTlOx9w8CtFEHU2cG4Gdcpu5NFpv6a5FWZNO-GRYrWfW1laZBviaE1Twwva-thbY~G5un9JFAoQZ88mS2JRKrxFuy1P1xCEEEiLvJfOcHVdL-0ebQV5q5Cwlyvrkki1se4URzlgF-FjQjTiaS0kbtHv6NkG-R19poUQu-ktMdMdDf2RLFBJPtyTvbyteyeXnI4LjGxSzQ8eH3txelIZKXwCRPYFNqutAmoQMqLf~NLDPtIq3QGp798sBbt3nooOKGEk3RVcJDwEzx~t3Qj6DWEA0xwSm56YYG84EYT2itIYGH8J4epFjGdV3zfWiME~QHLKfAwwkY-JdCiaDTk7RPfY1jkBw~SyI1jTYrX-PgAAAA
-
+sugadude.i2p=PIV8bZaIH4wRqzlzVLX1mDkELhLFdyLlKxcd2nUrJvd0YeTByls6LGFZ7wr0-9MT7cb3Ee23U1BApgm0~jT5bzFGIQOvx7AT8o0uMy~fcP1lhzo4lNwD5bHnf9OXe59FzORC3s79bwFmTtMCrEoYvQXCGherxwFfXywRPrJ2x0AjfjungiwX3vrndMdol1SDWTLdxTSARLPgLmswz47gGm4dOipjHBSGOm5bdgZBD6di8YGxHrB072QfXxBVSGzTgtQNnK4qAsZv1YbETk2CQ1nOKpCj0Zjkcnc1trTFOpUQKeOp6kiGCriAn8Ezbu1yuf2fiDAmPenFf8bDR7fNFR7kMDcKsbiht7fFi0wjPdE4Lx5H2PFyTuiw3~-osNsXFLtjvaeIV4P99vZRof1avADgp5k4pC8fEPKWfwXGPPFJjYEbWPE4VxmxcP93Iq-CMZfSd8fPeZNeBz8qL~n9IXJoXjO0G3nouQ7d1ZF4okVRO8FmZ91Umpy79v2I4sYFAAAA
\ No newline at end of file
diff --git a/installer/install.xml b/installer/install.xml
index 23dabd1fa3..cbf6649cce 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -1 +1 @@
-
I2P
0.4
http://www.i2p.net
Base installation files
\ No newline at end of file
+
i2p
0.4
http://www.i2p.net
Base installation files
\ No newline at end of file
diff --git a/installer/resources/ProcessPanel.Spec.xml b/installer/resources/ProcessPanel.Spec.xml
index 30c68d3a0a..7cdb2f0e8b 100644
--- a/installer/resources/ProcessPanel.Spec.xml
+++ b/installer/resources/ProcessPanel.Spec.xml
@@ -3,8 +3,8 @@
-
- /c"$INSTALL_PATH\postinstall.bat"
+
+ $INSTALL_PATH
diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
index 482326303d..0705905fee 100644
--- a/installer/resources/i2prouter
+++ b/installer/resources/i2prouter
@@ -18,7 +18,7 @@ APP_LONG_NAME="I2P Service"
# Wrapper
WRAPPER_CMD="./i2psvc"
-WRAPPER_CONF="wrapper.conf"
+WRAPPER_CONF="wrapper.config"
# Priority at which to run the wrapper. See "man nice" for valid priorities.
# nice is only used if a priority is specified.
diff --git a/installer/resources/i2prouter.bat b/installer/resources/i2prouter.bat
index 7f6977e097..34fbe16990 100644
--- a/installer/resources/i2prouter.bat
+++ b/installer/resources/i2prouter.bat
@@ -28,7 +28,7 @@ rem
:conf
set _WRAPPER_CONF="%~f1"
if not %_WRAPPER_CONF%=="" goto startup
-set _WRAPPER_CONF="%_REALPATH%wrapper.conf"
+set _WRAPPER_CONF="%_REALPATH%wrapper.config"
rem
rem Start the Wrapper
diff --git a/installer/resources/i2ptunnel.config b/installer/resources/i2ptunnel.config
index 174ae05502..68a9df32ff 100644
--- a/installer/resources/i2ptunnel.config
+++ b/installer/resources/i2ptunnel.config
@@ -8,7 +8,7 @@ tunnel.0.proxyList=squid.i2p,www1.squid.i2p
tunnel.0.i2cpHost=localhost
tunnel.0.i2cpPort=7654
tunnel.0.option.tunnels.depthInbound=2
-tunnel.0.option.tunnels.numInbound=2
+tunnel.0.option.tunnels.numTunnels=2
tunnel.0.startOnLoad=true
# irc
@@ -21,7 +21,7 @@ tunnel.1.targetDestination=irc.duck.i2p
tunnel.1.i2cpHost=localhost
tunnel.1.i2cpPort=7654
tunnel.1.option.tunnels.depthInbound=2
-tunnel.1.option.tunnels.numInbound=2
+tunnel.1.option.tunnels.numTunnels=2
tunnel.1.startOnLoad=true
# I2P's cvs server
@@ -34,7 +34,7 @@ tunnel.2.targetDestination=cvs.i2p
tunnel.2.i2cpHost=localhost
tunnel.2.i2cpPort=7654
tunnel.2.option.tunnels.depthInbound=2
-tunnel.2.option.tunnels.numInbound=2
+tunnel.2.option.tunnels.numTunnels=2
tunnel.2.startOnLoad=false
# local eepserver
@@ -47,5 +47,5 @@ tunnel.2.startOnLoad=false
#tunnel.3.i2cpHost=localhost
#tunnel.3.i2cpPort=7654
#tunnel.3.option.tunnels.depthInbound=2
-#tunnel.3.option.tunnels.numInbound=2
+#tunnel.3.option.tunnels.numTunnels=2
#tunnel.3.startOnLoad=true
\ No newline at end of file
diff --git a/installer/resources/postinstall.bat b/installer/resources/postinstall.bat
index 6f388c9eda..1fedb3c255 100644
--- a/installer/resources/postinstall.bat
+++ b/installer/resources/postinstall.bat
@@ -12,10 +12,19 @@
@echo off
setlocal
+
+if "%OS%"=="Windows_NT" (
set INSTALL_PATH=%~dp0
+) else (
+set INSTALL_PATH="%1"
+)
+
copy "%INSTALL_PATH%lib\wrapper\win32\I2Psvc.exe" "%INSTALL_PATH%"
copy "%INSTALL_PATH%lib\wrapper\win32\wrapper.dll" "%INSTALL_PATH%lib"
copy "%INSTALL_PATH%lib\wrapper\win32\wrapper.jar" "%INSTALL_PATH%lib"
+
+if "%OS%"=="Windows_NT" (
+
del /f /q "%INSTALL_PATH%i2prouter"
:: del /f /q "%INSTALL_PATH%install_i2p_service_unix"
del /f /q "%INSTALL_PATH%install-headless.txt"
@@ -25,3 +34,19 @@ del /f /q "%INSTALL_PATH%postinstall.sh"
del /f /q "%INSTALL_PATH%icons\*.xpm"
rmdir /q /s "%INSTALL_PATH%lib\wrapper"
start /b /i /d"%INSTALL_PATH%" i2prouter.bat
+
+) else (
+
+del "%INSTALL_PATH%i2prouter"
+:: del "%INSTALL_PATH%install_i2p_service_unix"
+del "%INSTALL_PATH%install_i2p_service_winnt.bat"
+del "%INSTALL_PATH%install-headless.txt"
+del "%INSTALL_PATH%osid"
+del "%INSTALL_PATH%postinstall.sh"
+:: del "%INSTALL_PATH%uninstall_i2p_service_unix"
+del "%INSTALL_PATH%uninstall_i2p_service_winnt.bat"
+del "%INSTALL_PATH%icons\*.xpm"
+deltree /Y "%INSTALL_PATH%lib\wrapper"
+start /M "%INSTALL_PATH%i2prouter.bat"
+
+)
diff --git a/installer/resources/postinstall.sh b/installer/resources/postinstall.sh
index c4d0332716..ee59fb136a 100644
--- a/installer/resources/postinstall.sh
+++ b/installer/resources/postinstall.sh
@@ -56,8 +56,8 @@ esac
cp $wrapperpath/wrapper.jar ./lib/
cp $wrapperpath/i2psvc .
chmod 744 ./i2psvc
-rm -rdf ./icons
-rm -rdf ./lib/wrapper
+rm -rf ./icons
+rm -rf ./lib/wrapper
rm -f ./lib/*.dll
rm -f ./*.bat
./i2prouter start
diff --git a/installer/resources/wrapper.conf b/installer/resources/wrapper.config
similarity index 100%
rename from installer/resources/wrapper.conf
rename to installer/resources/wrapper.config
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 8992d143e6..df935e221c 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
*
*/
public class RouterVersion {
- public final static String ID = "$Revision: 1.26 $ $Date: 2004/09/07 04:49:03 $";
+ public final static String ID = "$Revision: 1.27 $ $Date: 2004/09/07 17:13:11 $";
public final static String VERSION = "0.4";
- public final static long BUILD = 9;
+ public final static long BUILD = 10;
public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION);
System.out.println("Router ID: " + RouterVersion.ID);