zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

merge of '7d480c0749394d3ee1b10c1f714a1be3091596f8'

Browse Source 
and '9cb464ed9b358b1e9807792b37f703977d6f5f96'
This commit is contained in:
kytv
2013-07-02 18:17:02 +00:00
parent 98d932a0f5 eb051d64c7
commit fb93609d8b
8 changed files with 57 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
debian/patches/0001-path-substitution.patch vendored
View File

@@ -144,8 +144,8 @@ Debian wrapper.config to try to prevent confusion.
}
showsetusermesg() {
- echo "`gettext \"Please edit $0 and set the variable RUN_AS_USER\"`."
+ echo "`gettext "Please edit /etc/default/i2p and set the variable RUN_AS_USER"`."
- echo "`gettext 'Please edit i2prouter and set the variable RUN_AS_USER'`."
+ echo "`gettext 'Please edit /etc/default/i2p and set the variable RUN_AS_USER'`."
}
checkifstartingasroot() {
@@ -153,12 +153,12 @@ Debian wrapper.config to try to prevent confusion.
echo "`gettext 'Running I2P as the root user is *not* recommended.'`"
showsetusermesg
echo
- echo "`gettext \"To run as root anyway, edit $0 and set ALLOW_ROOT=true.\"`"
+ echo "`gettext \"To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true.\"`"
- echo "`gettext 'To run as root anyway, edit i2prouter and set ALLOW_ROOT=true.'`"
+ echo "`gettext 'To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true.'`"
exit 1
fi
}
@@ -1866,23 +1809,9 @@
@@ -1858,24 +1806,9 @@
status
;;
@@ -179,12 +179,13 @@ Debian wrapper.config to try to prevent confusion.
-
- 'remove' | 'uninstall')
- removedaemon
- ;;
+ 'install' | 'remove' | 'uninstall')
+ echo "Use \"dpkg-reconfigure i2p\" to configure the initscript."
+ exit 1
;;
'dump')
checkUser "" "$COMMAND"
--- a/installer/resources/runplain.sh
+++ b/installer/resources/runplain.sh
@@ -11,8 +11,8 @@
@@ -329,8 +330,8 @@ Debian wrapper.config to try to prevent confusion.
msgstr "Falls gestartet, fordere einen Java Thread dump an"
#: ../i2prouter:1788
-msgid "Please edit $0 and set the variable RUN_AS_USER"
-msgstr "Bitte bearbeite $0 und setze die Variable RUN_AS_USER"
-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
-msgstr "Bitte bearbeite i2prouter und setze die Variable RUN_AS_USER"
+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
+msgstr "Bitte bearbeite /etc/default/i2p und setze die Variable RUN_AS_USER"
@@ -339,10 +340,10 @@ Debian wrapper.config to try to prevent confusion.
msgstr "I2P als root Benutzer auszuführen ist *nicht* empfehlenswert."
#: ../i2prouter:1796
-msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
msgstr ""
-"Um I2P trotzdem als root auszuführen bearbeite $0 und setze ALLOW_ROOT=true."
-"Um I2P trotzdem als root auszuführen bearbeite i2prouter und setze ALLOW_ROOT=true."
+"Um I2P trotzdem als root auszuführen bearbeite /etc/default/i2p und setze ALLOW_ROOT=true."
--- a/installer/resources/locale/po/messages_en.po
+++ b/installer/resources/locale/po/messages_en.po
@@ -350,7 +351,7 @@ Debian wrapper.config to try to prevent confusion.
msgstr ""
#: ../i2prouter:1788
-msgid "Please edit $0 and set the variable RUN_AS_USER"
-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
msgstr ""
@@ -359,7 +360,7 @@ Debian wrapper.config to try to prevent confusion.
msgstr ""
#: ../i2prouter:1796
-msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
msgstr ""
--- a/installer/resources/locale/po/messages_fr.po
@@ -368,7 +369,7 @@ Debian wrapper.config to try to prevent confusion.
msgstr "Request a Java thread dump if running."
#: ../i2prouter:1788
-msgid "Please edit $0 and set the variable RUN_AS_USER"
-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
-msgstr "Veuillez éditer $0 et paramétrer la variable RUN_AS_USER"
+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
+msgstr "Veuillez éditer /etc/default/i2p et paramétrer la variable RUN_AS_USER"
@@ -378,7 +379,7 @@ Debian wrapper.config to try to prevent confusion.
msgstr "Faire fonctionner I2P en tant qu'utilisateur root n'est *pas* recommandé."
#: ../i2prouter:1796
-msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
-msgstr "Pour exécuter en tant que root de toute façon, éditer $0 et mettre ALLOW_ROOT=true."
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
+msgstr "Pour exécuter en tant que root de toute façon, éditer /etc/default/i2p et mettre ALLOW_ROOT=true."
@@ -388,7 +389,7 @@ Debian wrapper.config to try to prevent confusion.
msgstr ""
#: ../i2prouter:1780
-msgid "Please edit $0 and set the variable RUN_AS_USER"
-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
msgstr ""
@@ -397,7 +398,7 @@ Debian wrapper.config to try to prevent confusion.
msgstr ""
#: ../i2prouter:1788
-msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
msgstr ""
--- a/installer/resources/locale/po/messages_ru.po
@@ -406,7 +407,7 @@ Debian wrapper.config to try to prevent confusion.
msgstr ""
#: ../i2prouter:1780
-msgid "Please edit $0 and set the variable RUN_AS_USER"
-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
msgstr ""
@@ -415,6 +416,26 @@ Debian wrapper.config to try to prevent confusion.
msgstr ""
#: ../i2prouter:1788
-msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
msgstr ""
--- a/installer/resources/locale/po/messages_sv.po
+++ b/installer/resources/locale/po/messages_sv.po
@@ -187,13 +187,13 @@
msgstr "Fråga efter en Java thread dump vid drift."
#: ../i2prouter:1780
-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
-msgstr "Var god ändra i2prouter och sätt variabeln RUN_AS_USER"
+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
+msgstr "Var god ändra /etc/default/i2p och sätt variabeln RUN_AS_USER"
#: ../i2prouter:1785
msgid "Running I2P as the root user is *not* recommended."
msgstr "Att köra I2P som användare root är *inte* rekommenderat."
#: ../i2prouter:1788
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
-msgstr "För att köra som root iallafall, ändra i2prouter och sätt ALLOW_ROOT=true"
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
+msgstr "För att köra som root iallafall, ändra /etc/default/i2p och sätt ALLOW_ROOT=true"

4
installer/resources/i2prouter
View File

@@ -1793,7 +1793,7 @@ showUsage() {
}
showsetusermesg() {
echo "`gettext \"Please edit $0 and set the variable RUN_AS_USER\"`."
echo "`gettext 'Please edit i2prouter and set the variable RUN_AS_USER'`."
}
checkifstartingasroot() {
@@ -1801,7 +1801,7 @@ checkifstartingasroot() {
echo "`gettext 'Running I2P as the root user is *not* recommended.'`"
showsetusermesg
echo
echo "`gettext \"To run as root anyway, edit $0 and set ALLOW_ROOT=true.\"`"
echo "`gettext 'To run as root anyway, edit i2prouter and set ALLOW_ROOT=true.'`"
exit 1
fi
}

8
installer/resources/locale/po/messages_de.po
View File

@@ -192,14 +192,14 @@ msgid "Request a Java thread dump if running."
msgstr "Falls gestartet, fordere einen Java Thread dump an"
#: ../i2prouter:1788
msgid "Please edit $0 and set the variable RUN_AS_USER"
msgstr "Bitte bearbeite $0 und setze die Variable RUN_AS_USER"
msgid "Please edit i2prouter and set the variable RUN_AS_USER"
msgstr "Bitte bearbeite i2prouter und setze die Variable RUN_AS_USER"
#: ../i2prouter:1793
msgid "Running I2P as the root user is *not* recommended."
msgstr "I2P als root Benutzer auszuführen ist *nicht* empfehlenswert."
#: ../i2prouter:1796
msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
msgstr ""
"Um I2P trotzdem als root auszuführen bearbeite $0 und setze ALLOW_ROOT=true."
"Um I2P trotzdem als root auszuführen bearbeite i2prouter und setze ALLOW_ROOT=true."

4
installer/resources/locale/po/messages_en.po
View File

@@ -185,7 +185,7 @@ msgid "Request a Java thread dump if running."
msgstr ""
#: ../i2prouter:1788
msgid "Please edit $0 and set the variable RUN_AS_USER"
msgid "Please edit i2prouter and set the variable RUN_AS_USER"
msgstr ""
#: ../i2prouter:1793
@@ -193,5 +193,5 @@ msgid "Running I2P as the root user is *not* recommended."
msgstr ""
#: ../i2prouter:1796
msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
msgstr ""

4
installer/resources/locale/po/messages_fr.po
View File

@@ -186,7 +186,7 @@ msgid "Request a Java thread dump if running."
msgstr "Request a Java thread dump if running."
#: ../i2prouter:1788
msgid "Please edit $0 and set the variable RUN_AS_USER"
msgid "Please edit i2prouter and set the variable RUN_AS_USER"
msgstr "Veuillez éditer $0 et paramétrer la variable RUN_AS_USER"
#: ../i2prouter:1793
@@ -194,5 +194,5 @@ msgid "Running I2P as the root user is *not* recommended."
msgstr "Faire fonctionner I2P en tant qu'utilisateur root n'est *pas* recommandé."
#: ../i2prouter:1796
msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
msgstr "Pour exécuter en tant que root de toute façon, éditer $0 et mettre ALLOW_ROOT=true."

4
installer/resources/locale/po/messages_it.po
View File

@@ -187,7 +187,7 @@ msgid "Request a Java thread dump if running."
msgstr ""
#: ../i2prouter:1780
msgid "Please edit $0 and set the variable RUN_AS_USER"
msgid "Please edit i2prouter and set the variable RUN_AS_USER"
msgstr ""
#: ../i2prouter:1785
@@ -195,5 +195,5 @@ msgid "Running I2P as the root user is *not* recommended."
msgstr ""
#: ../i2prouter:1788
msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
msgstr ""

4
installer/resources/locale/po/messages_ru.po
View File

@@ -188,7 +188,7 @@ msgid "Request a Java thread dump if running."
msgstr ""
#: ../i2prouter:1780
msgid "Please edit $0 and set the variable RUN_AS_USER"
msgid "Please edit i2prouter and set the variable RUN_AS_USER"
msgstr ""
#: ../i2prouter:1785
@@ -196,5 +196,5 @@ msgid "Running I2P as the root user is *not* recommended."
msgstr ""
#: ../i2prouter:1788
msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
msgstr ""

8
installer/resources/locale/po/messages_sv.po
View File

@@ -187,13 +187,13 @@ msgid "Request a Java thread dump if running."
msgstr "Fråga efter en Java thread dump vid drift."
#: ../i2prouter:1780
msgid "Please edit $0 and set the variable RUN_AS_USER"
msgstr "Var god ändra $0 och sätt variabeln RUN_AS_USER"
msgid "Please edit i2prouter and set the variable RUN_AS_USER"
msgstr "Var god ändra i2prouter och sätt variabeln RUN_AS_USER"
#: ../i2prouter:1785
msgid "Running I2P as the root user is *not* recommended."
msgstr "Att köra I2P som användare root är *inte* rekommenderat."
#: ../i2prouter:1788
msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
msgstr "För att köra som root iallafall, ändra $0 och sätt ALLOW_ROOT=true"
msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
msgstr "För att köra som root iallafall, ändra i2prouter och sätt ALLOW_ROOT=true"