diff --git a/debian/rules b/debian/rules
index f03ea275d4ece4ba1d2c291e7a351b78b8da754f..3c4cfd3a50c59f8d21ed3a90951318752aa1cfb0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ endif
mkdir -p debian/tmp/etc/i2p
mkdir -p debian/tmp/usr/share/i2p/lib
mkdir -p debian/tmp/usr/share/doc/i2p
+ mkdir -p debian/tmp/usr/share/man/man1
mkdir -p debian/tmp/usr/lib/i2p
mkdir -p debian/tmp/usr/bin
@@ -60,6 +61,10 @@ endif
rm debian/tmp/usr/share/doc/i2p/licenses/LICENSE-GPLv2.txt
rm debian/tmp/usr/share/doc/i2p/licenses/LICENSE-LGPLv2.1.txt
+ @# man pages
+ gzip -9c installer/resources/man/eepget.1 > debian/tmp/usr/share/man/man1/eepget.1.gz
+ gzip -9c installer/resources/man/i2prouter.1 > debian/tmp/usr/share/man/man1/i2prouter.1.gz
+
@# copy wrapper files to /usr/lib/i2p (including wrapper.jar because it is architecture dependent)
cp ${wrapperpath}/libwrapper.so debian/tmp/usr/lib/i2p/
cp ${wrapperpath}/wrapper.jar debian/tmp/usr/lib/i2p/
diff --git a/debian/scripts/postinst b/debian/scripts/postinst
index 24ed3e3de3998da784230734eec9bfea76f5d504..f6d7c034b5959f574ecd73ada70298c6948c6be5 100755
--- a/debian/scripts/postinst
+++ b/debian/scripts/postinst
@@ -1,4 +1,6 @@
#!/bin/sh
+set -e
+
SVCHOME=/var/lib/i2p
I2P=/usr/share/i2p
I2PUSER=i2psvc
diff --git a/debian/scripts/postrm b/debian/scripts/postrm
index 38a4170ab1636e7ef9ba9fd9f06bf221305205f4..83f06ce7812d8126e111fc574b54a3e9e3fc272b 100755
--- a/debian/scripts/postrm
+++ b/debian/scripts/postrm
@@ -1,12 +1,14 @@
#!/bin/sh
+set -e
# /etc/rc*.d/*i2p files
update-rc.d -f i2p remove
I2PUSER=i2psvc
# delete $I2PUSER if it exists (it will not if this is a purge after a remove)
-id $I2PUSER 2>/dev/null
-if [ $? -eq 0 ]; then
+# the "| cat" sets the exit code to zero so the script doesn't abort
+entry=`getent passwd | cut -d: -f1 | grep i2psvc | cat`
+if [ -n "$entry" ]; then
exec userdel $I2PUSER
fi
diff --git a/debian/scripts/prerm b/debian/scripts/prerm
index 18c1f792825a5be4617cba436059a34b73210506..1777a4ecbaff77aa6aed273674d374c595aff723 100755
--- a/debian/scripts/prerm
+++ b/debian/scripts/prerm
@@ -1,4 +1,6 @@
#!/bin/sh
+set -e
+
invoke-rc.d i2p stop
# stuff in /tmp
diff --git a/installer/resources/man/eepget.1 b/installer/resources/man/eepget.1
new file mode 100644
index 0000000000000000000000000000000000000000..d8509d4c6185f8e48a9a4d56ad2282c5f17248f3
--- /dev/null
+++ b/installer/resources/man/eepget.1
@@ -0,0 +1,53 @@
+.\"Created with GNOME Manpages Editor Wizard
+.\"http://sourceforge.net/projects/gmanedit2
+.TH Eepget 1 "November 13, 2010" "" "Eepget - I2P Downloader"
+
+.SH NAME
+Eepget \- I2P downloader
+
+.SH SYNOPSIS
+.B eepget
+.RI [ options ] URL
+.br
+
+.SH DESCRIPTION
+\fBEepget\fP downloads a file via HTTP through the I2P network. It handles .i2p URLs as well as URLs on the regular web such as .com.
+
+.SH OPTIONS
+.B
+\fB\-p\fR proxy_host:port
+.TP
+Sets the I2P proxy server (eeproxy) to use. The default is 127.0.0.1:4444.
+.TP
+
+.B
+\fB\-n\fR retries
+.TP
+Sets the number of retries if the download fails. The default is 3.
+.TP
+
+.B
+\fB\-o\fR file
+.TP
+Sets the output file to write to. If this option is not given, the URL determines the output filename.
+.TP
+
+.B
+\fB\-m\fR markSize lineLen
+.TP
+Controls the progress display. \fB\ markSize \fP is the number of bytes one '#' character represents. \fB\ lineLen \fP is the length of one progress line in characters. The defaults are 1024 and 40.
+.TP
+
+.B
+\fB\-t\fR seconds
+.TP
+Sets the inactivity timeout. The default is 60 seconds.
+.TP
+
+.SH "EXIT STATUS"
+
+\fB Eepget\fP always exits with the status 0.
+
+.SH "SEE ALSO"
+
+wget(1)
diff --git a/installer/resources/man/i2prouter.1 b/installer/resources/man/i2prouter.1
new file mode 100644
index 0000000000000000000000000000000000000000..e1ba8f6232ac720c15ff2e2c1848a14a7499f85d
--- /dev/null
+++ b/installer/resources/man/i2prouter.1
@@ -0,0 +1,38 @@
+.\"Created with GNOME Manpages Editor Wizard
+.\"http://sourceforge.net/projects/gmanedit2
+.TH i2prouter 1 "November 13, 2010" "" "I2PRouter"
+
+.SH NAME
+i2prouter \- start and stop the I2P router
+
+.SH SYNOPSIS
+.B i2prouter
+.RI { console | start | stop | restart | status | dump }
+.br
+
+.SH DESCRIPTION
+\fBi2prouter\fP controls the I2P service. It takes options similar to init scripts.
+
+.B
+.IP console
+Runs I2P as a console application under the current user.
+
+.B
+.IP start
+Starts the I2P service.
+
+.B
+.IP stop
+Stops the I2P service.
+
+.B
+.IP restart
+Stops the I2P service and then starts it.
+
+.B
+.IP status
+Prints whether the I2P service is running.
+
+.B
+.IP dump
+Dumps the current threads into\fB wrapper.log\fP.
diff --git a/installer/resources/readme/readme.html b/installer/resources/readme/readme.html
index 0eba18fa8280ebb74f0a55241742e8c7eec9acc3..fddcbdde8c46bbddddde873baa0a1ccead39c061 100644
--- a/installer/resources/readme/readme.html
+++ b/installer/resources/readme/readme.html
@@ -3,7 +3,7 @@
<a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a>
<a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a>
<a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Français" alt="Français"></a>
- <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Español">
+ <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Español"></a>
<a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a>
<a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="РуÑÑкий" alt="РуÑÑкий"></a>
<a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
diff --git a/installer/resources/readme/readme_de.html b/installer/resources/readme/readme_de.html
index 5dd4fc2e3b1da7882a8fb07b6172bbc66e2755bd..db5398d9c4dfbc4576772b336a6a2e7fc12b065e 100644
--- a/installer/resources/readme/readme_de.html
+++ b/installer/resources/readme/readme_de.html
@@ -1,6 +1,6 @@
<div lang="de">
<div align="right">
-<div class="langbox" align="right"><a href="/index.jsp?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Français" alt="Français"></a> <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Español"> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="РуÑÑкий" alt="РуÑÑкий"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
+<div class="langbox" align="right"><a href="/index.jsp?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Français" alt="Français"></a> <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Español"></a> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="РуÑÑкий" alt="РуÑÑкий"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
</div>
<div class="welcome"><h2>Willkommen im I2P!</h2></div>
<p>Wenn Du I2P gerade gestartet hast, sollten die "Aktiv:"-Zahlen links in den nächsten paar Minuten anwachsen, und Du siehst dann dort ein als "versch. Klienten" bezeichnetes lokales Ziel gelistet (falls nicht, <a href="#trouble">siehe unten</a>). Sobald das erscheint, kannst Du:</p>
diff --git a/installer/resources/readme/readme_es.html b/installer/resources/readme/readme_es.html
index a3bca878fbfc792ab3e7b736f16e3704230315de..81167779351bef080f1820b4269dc5dd7645123d 100644
--- a/installer/resources/readme/readme_es.html
+++ b/installer/resources/readme/readme_es.html
@@ -1,6 +1,6 @@
<div lang="es">
<div align="right">
-<div class="langbox" align="right"><a href="/index.jsp?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Français" alt="Français"></a> <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Español"> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="РуÑÑкий" alt="РуÑÑкий"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
+<div class="langbox" align="right"><a href="/index.jsp?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Français" alt="Français"></a> <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Español"></a> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="РуÑÑкий" alt="РуÑÑкий"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
</div>
<div class="welcome"><h2>¡Bienvenido a I2P!</h2></div>
<p>Si acabas de arrancar I2P los números a la derecha de "Active:" deberían subir en los próximos minutos y luego verás allí una Destinación llamada "shared clients" <br>(si no, <a href="#trouble">¡mira abajo!</a>) Apenas aparezca esto, puedes:</p>
diff --git a/installer/resources/readme/readme_fr.html b/installer/resources/readme/readme_fr.html
index eefcce7fb37763bf471f71312070bcc79daf82ad..6f31b2705f0b0c8fd38df6c7130509844841a7c7 100644
--- a/installer/resources/readme/readme_fr.html
+++ b/installer/resources/readme/readme_fr.html
@@ -1,6 +1,6 @@
<div lang="fr">
<div align="right">
-<div class="langbox" align="right"><a href="/index.jsp?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Français" alt="Français"></a> <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Español"> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="РуÑÑкий" alt="РуÑÑкий"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
+<div class="langbox" align="right"><a href="/index.jsp?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Français" alt="Français"></a> <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Español"></a> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="РуÑÑкий" alt="РуÑÑкий"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
</div>
<div class="welcome"><h2>Bienvenu sur I2P!</h2></div>
<p>Si vous venez juste de lancer I2P, les chiffres sur la gauche à coté de Active devraient commencer à augmenter dans les prochaines minutes et vous verrez un "Shared client" en destination locale listés sur la gauche (si non, <a href=#trouble>voir plus bas</a>). Une fois qu'ils apparaissent, vous pouvez:</p>
diff --git a/installer/resources/readme/readme_nl.html b/installer/resources/readme/readme_nl.html
index 754e9a10ab79647bd4082743d5c6e76dd4d5c621..210396bdf837863cbab3c5907506c918395f6510 100644
--- a/installer/resources/readme/readme_nl.html
+++ b/installer/resources/readme/readme_nl.html
@@ -1,6 +1,6 @@
<div lang="nl">
<div align="right">
-<div class="langbox" align="right"><a href="/index.jsp?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Français" alt="Français"></a> <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Español"> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="РуÑÑкий" alt="РуÑÑкий"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
+<div class="langbox" align="right"><a href="/index.jsp?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Français" alt="Français"></a> <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Español"></a> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="РуÑÑкий" alt="РуÑÑкий"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
</div>
<div class="welcome"><h2>Welkom bij I2P!</h2></div>
<p>Als je net I2P opgestart hebt, zullen de 'Active:' (Actieve) getallen aan de linkerkant in de komende minuten stijgen, en je zal een "Shared clients" (Gedeelde clients) lokale bestemming zien staan aan de linkerkant (indien niet, <a href=#trouble>zie hieronder</a>). Eenmaal je deze bestemming ziet, kan je:</p>
diff --git a/installer/resources/readme/readme_ru.html b/installer/resources/readme/readme_ru.html
index 78526e485a02b765eaea949f239f2fcddc9de59d..5f948830346839934cd4ec2c8ec5bb1e43a9f4ce 100644
--- a/installer/resources/readme/readme_ru.html
+++ b/installer/resources/readme/readme_ru.html
@@ -4,7 +4,7 @@
<a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="ä¸æ–‡" alt="ä¸æ–‡"></a>
<a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a>
<a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Français" alt="Français"></a>
- <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Español">
+ <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Español"></a>
<a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a>
<a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="РуÑÑкий" alt="РуÑÑкий"></a>
<a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
diff --git a/installer/resources/readme/readme_sv.html b/installer/resources/readme/readme_sv.html
index 2708cb55d4ec7e3fc9920bc9ee754df0bf384401..0cbdd35f496221278ec07a5de631030534824f36 100644
--- a/installer/resources/readme/readme_sv.html
+++ b/installer/resources/readme/readme_sv.html
@@ -1,6 +1,6 @@
<div lang="sv">
<div align="right">
-<div class="langbox" align="right"><a href="/index.jsp?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Français" alt="Français"></a> <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Español"> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="РуÑÑкий" alt="РуÑÑкий"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
+<div class="langbox" align="right"><a href="/index.jsp?lang=en"><img src="/flags.jsp?c=us" title="English" alt="English"></a> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Français" alt="Français"></a> <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Español"></a> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="РуÑÑкий" alt="РуÑÑкий"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
</div>
<div class="welcome"><h2>Welcome to I2P!</h2></div>
<p>Om du just har startat I2P kommer de "Aktiva: #/#" börja öka inom
diff --git a/installer/resources/readme/readme_zh.html b/installer/resources/readme/readme_zh.html
index d412b94541e1eae2c8838547786504b0fa5e880c..68e68c2e4a819228c247d676a2da778eca585606 100644
--- a/installer/resources/readme/readme_zh.html
+++ b/installer/resources/readme/readme_zh.html
@@ -4,7 +4,7 @@
<a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a>
<a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a>
<a href="/index.jsp?lang=fr"><img src="/flags.jsp?c=fr" title="Français" alt="Français"></a>
- <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Español">
+ <a href="/index.jsp?lang=es"><img src="/flags.jsp?c=es" title="Español" alt="Español"></a>
<a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a>
<a href="/index.jsp?lang=ru"><img src="/flags.jsp?c=ru" title="РуÑÑкий" alt="РуÑÑкий"></a>
<a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>