Iain R. Learmonth commited on 2017-10-10 23:20:26
Zeige 2 geänderte Dateien mit 17 Einfügungen und 17 Löschungen.
Signed-off-by: hiromipaw <hiro@torproject.org>
... | ... |
@@ -21,7 +21,7 @@ Debian Buster - testing, or Debian Sid - unstable</a></h2> |
21 | 21 |
|
22 | 22 |
<p> |
23 | 23 |
If you're using Debian, just run |
24 |
-</blockquote><pre> apt-get install tor </pre></blockquote> |
|
24 |
+</blockquote><pre> apt install tor </pre></blockquote> |
|
25 | 25 |
as root. |
26 | 26 |
</p> |
27 | 27 |
|
... | ... |
@@ -104,10 +104,10 @@ gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - |
104 | 104 |
|
105 | 105 |
<div id="apt-get"> |
106 | 106 |
<p>You can install it with the following commands:</p> |
107 |
-<blockquote><pre>$ apt-get update |
|
108 |
-<span id="regular-install">$ apt-get install <span id="apt-package">tor</span> deb.torproject.org-keyring</span> |
|
109 |
-<span id="source-install">$ apt-get install build-essential fakeroot devscripts |
|
110 |
-$ apt-get build-dep tor deb.torproject.org-keyring</span></pre></blockquote> |
|
107 |
+<blockquote><pre>$ apt update |
|
108 |
+<span id="regular-install">$ apt install <span id="apt-package">tor</span> deb.torproject.org-keyring</span> |
|
109 |
+<span id="source-install">$ apt install build-essential fakeroot devscripts |
|
110 |
+$ apt build-dep tor deb.torproject.org-keyring</span></pre></blockquote> |
|
111 | 111 |
|
112 | 112 |
<div id="source-install2"> |
113 | 113 |
<p> |
... | ... |
@@ -115,7 +115,7 @@ Then you can build Tor in ~/debian-packages: |
115 | 115 |
</p> |
116 | 116 |
<blockquote><pre> |
117 | 117 |
$ mkdir ~/debian-packages; cd ~/debian-packages |
118 |
-$ apt-get source tor |
|
118 |
+$ apt source tor |
|
119 | 119 |
$ cd tor-* |
120 | 120 |
$ debuild -rfakeroot -uc -us |
121 | 121 |
$ cd .. |
... | ... |
@@ -151,7 +151,7 @@ gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - |
151 | 151 |
Now refresh your sources, running the following command (as root) at your |
152 | 152 |
command prompt: |
153 | 153 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
154 |
-apt-get update |
|
154 |
+apt update |
|
155 | 155 |
</pre> |
156 | 156 |
If there are no errors you're good to continue. |
157 | 157 |
</p> |
... | ... |
@@ -160,14 +160,14 @@ If there are no errors you're good to continue. |
160 | 160 |
We provide a Debian package to help you keep our signing key current. It is |
161 | 161 |
recommended you use it. Install it using |
162 | 162 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
163 |
-apt-get install deb.torproject.org-keyring |
|
163 |
+apt install deb.torproject.org-keyring |
|
164 | 164 |
</pre> |
165 | 165 |
</p> |
166 | 166 |
|
167 | 167 |
<p> |
168 | 168 |
To finally install Tor just run: |
169 | 169 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
170 |
-apt-get install tor |
|
170 |
+apt install tor |
|
171 | 171 |
</pre> |
172 | 172 |
</p> |
173 | 173 |
|
... | ... |
@@ -214,8 +214,8 @@ Then run the following commands at your command prompt: |
214 | 214 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
215 | 215 |
gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 |
216 | 216 |
gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - |
217 |
-apt-get update |
|
218 |
-apt-get install tor deb.torproject.org-keyring |
|
217 |
+apt update |
|
218 |
+apt install tor deb.torproject.org-keyring |
|
219 | 219 |
</pre> |
220 | 220 |
</p> |
221 | 221 |
|
... | ... |
@@ -244,18 +244,18 @@ deb-src http://deb.torproject.org/torproject.org tor-experimental-0.3.0.x-<DI |
244 | 244 |
</pre> |
245 | 245 |
Substitute the name of your distro (wheezy, sid, trusty, ...) in place of <DISTRIBUTION>. Now refresh your sources by running (as root): |
246 | 246 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
247 |
-apt-get update |
|
247 |
+apt update |
|
248 | 248 |
</pre> |
249 | 249 |
You also need to install the necessary packages to build your own debs and the |
250 | 250 |
packages needed to build Tor: |
251 | 251 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
252 |
-apt-get install build-essential fakeroot devscripts |
|
253 |
-apt-get build-dep tor |
|
252 |
+apt install build-essential fakeroot devscripts |
|
253 |
+apt build-dep tor |
|
254 | 254 |
</pre> |
255 | 255 |
Then you can build Tor in ~/debian-packages: |
256 | 256 |
<pre style="margin: 1.5em 0 1.5em 2em"> |
257 | 257 |
mkdir ~/debian-packages; cd ~/debian-packages |
258 |
-apt-get source tor |
|
258 |
+apt source tor |
|
259 | 259 |
cd tor-* |
260 | 260 |
debuild -rfakeroot -uc -us |
261 | 261 |
cd .. |
... | ... |
@@ -28,7 +28,7 @@ |
28 | 28 |
<h2><a class="anchor" href="#install">Step One: Download and Install Tor</a></h2> |
29 | 29 |
<br> |
30 | 30 |
|
31 |
- <p>If you're on Debian, start with "apt-get install tor".</p> |
|
31 |
+ <p>If you're on Debian, start with "apt install tor".</p> |
|
32 | 32 |
|
33 | 33 |
<p><b>Do not use the packages in Ubuntu's universe.</b> If you're |
34 | 34 |
on Ubuntu or if you want to track newer Tor packages, follow the |
... | ... |
@@ -169,7 +169,7 @@ href="<wiki>/doc/TorExitGuidelines">guidelines |
169 | 169 |
<p> |
170 | 170 |
13. You might like to use the <a |
171 | 171 |
href="https://www.atagar.com/arm/">arm</a> relay monitor to watch |
172 |
- your relay's activities from the command line. First, "sudo apt-get |
|
172 |
+ your relay's activities from the command line. First, "sudo apt |
|
173 | 173 |
install tor-arm". Second, as the user that will be running arm, run |
174 | 174 |
"sudo adduser $USER debian-tor" to add your user to the debian-tor |
175 | 175 |
group so it can reach Tor's controlsocket. Then log out and log back |
176 | 176 |