diff options
| author | elijah <elijah@riseup.net> | 2016-05-19 12:09:47 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2016-05-19 12:09:47 -0700 |
| commit | e5ea4fdfb04aab0c5701905cfc037c38b45bb8bd (patch) | |
| tree | 76d85855e2a508f573d971c58cc682cc2373ba4f /public | |
| parent | efcaf65ea6af5f30dd504afbe766e8aa2732e32b (diff) | |
cleaned up linux install page
Diffstat (limited to 'public')
| -rw-r--r-- | public/linux/index.en.html | 234 | ||||
| -rw-r--r-- | public/linux/index.es.html | 234 | ||||
| -rw-r--r-- | public/linux/index.pt.html | 234 | ||||
| -rw-r--r-- | public/linux/index.ru.html | 24 |
4 files changed, 364 insertions, 362 deletions
diff --git a/public/linux/index.en.html b/public/linux/index.en.html index e46a659..933475f 100644 --- a/public/linux/index.en.html +++ b/public/linux/index.en.html @@ -22,31 +22,37 @@ Bitmask Downloads <a href="#introduction">Introduction</a> </li> <li> - <a href="#ubuntu">Ubuntu</a> + <a href="#ubuntu-packages">Ubuntu Packages</a> <ol> <li> - <a href="#bundle">Bundle</a> + <a href="#ubuntu-1604-lts-xenial-xerus">Ubuntu 16.04 LTS (Xenial Xerus)</a> </li> <li> - <a href="#packages">Packages</a> + <a href="#ubuntu-1510-wily-werewolf">Ubuntu 15.10 (Wily Werewolf)</a> + </li> + <li> + <a href="#ubuntu-1504-vivid-vervet">Ubuntu 15.04 (Vivid Vervet)</a> </li> </ol> </li> <li> - <a href="#debian">Debian</a> + <a href="#debian-packages">Debian Packages</a> <ol> <li> - <a href="#bundle-2">Bundle</a> + <a href="#debian-8-stablejessie">Debian 8 (Stable/Jessie)</a> + </li> + <li> + <a href="#debian-testing-stretch">Debian Testing (Stretch)</a> + </li> + <li> + <a href="#debian-unstable-sid">Debian Unstable (Sid)</a> </li> <li> - <a href="#packages-2">Packages</a> + <a href="#stand-alone-bundle">Stand Alone Bundle</a> </li> </ol> </li> <li> - <a href="#other">Other</a> - </li> - <li> <a href="#upgrading">Upgrading</a> </li> </ol></div> @@ -59,144 +65,136 @@ Bitmask Downloads </div> </div> </p> -<h2><a name="introduction"></a>Introduction</h2> -<p>For <span class="caps">GNU</span>/Linux, we recommend following the installation method detailed below based on what distribution you are running.</p> -<p>To find out which distribution you are running, open a terminal and type in the following:</p> -<pre><code>cat /etc/issue</code></pre> -<h2><a name="ubuntu"></a>Ubuntu</h2> -<p>There are two ways to install bitmask on Ubuntu, via packages and via bundles. If you are comfortable with the command line, we recommend using packages when available, otherwise use the bundle. If installed as a package, Bitmask will run faster, be better integrated in the desktop environment, and will be faster to start.</p> -<p>For Ubuntu, we only provide packages for Wily Werewolf (15.10) and Vivid Vervet (15.04).</p> -<p>If you are using Trusty, then you will need to use the bundle method.</p> -<p>We are sorry, Precise Penguin (12.04) is not working at this time.</p> -<h3><a name="bundle"></a>Bundle</h3> -<p>First determine if you running a 32 bit or 64 bit kernel by running the following command:</p> -<pre><code>uname -m</code></pre> -<p>If the result is:</p> -<ul> - <li><code>x86_64</code>, you have <strong>64 bit</strong></li> - <li><code>i686</code>, you have <strong>32 bit</strong></li> - <li><code>i386</code>, you have <strong>32 bit</strong></li> -</ul> -<p>Then download the appropriate version below:</p> -<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz'> - <i class='fa fa-cloud-download fa-lg'></i> - Download 64 bit -</a> -</p> -<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz.asc">Signature file</a></p> -<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz'> - <i class='fa fa-cloud-download fa-lg'></i> - Download 32 bit -</a> -</p> -<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz.asc">Signature file</a></p> -<p>If you want to make sure that the Bitmask wasn’t messed with during download you can <a href="/en/signature-verification">authenticate the signature</a>.</p> -<p><strong><span class="caps">NOTE</span>:</strong><br /> - Stand-alone bundles are useful if want to run Bitmask from a thumb drive. Or from a distribution which we don’t support with packages.<br /> - There are two disadvantages to the stand-alone bundle:</p> + +<h1><a name="introduction"></a>Introduction</h1> + +<p>There are two ways to install Bitmask on Linux, as a <strong>package</strong> or as a stand-alone <strong>bundle</strong>.</p> + <ul> - <li>The Bitmask app will be less well integrated with the desktop environment.</li> - <li>Running from the bundle is slower to start than via packages.</li> +<li><strong>Packages</strong>: run faster, and are better integrated with the desktop environment.</li> +<li><strong>Bundles</strong>: do not require root, and can be installed on a portable thumb drive.</li> </ul> -<h3><a name="packages"></a>Packages</h3> -<p><strong>Xenial Xerus (16.04)</strong></p> + + +<p>To find out which distribution you are running, open a terminal and type in the following:</p> + +<pre><code>cat /etc/issue +</code></pre> + +<h1><a name="ubuntu-packages"></a>Ubuntu Packages</h1> + +<h3><a name="ubuntu-1604-lts-xenial-xerus"></a>Ubuntu 16.04 LTS (Xenial Xerus)</h3> + <p><p class='b'>To install</p> -<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian xenial main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> +<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian xenial main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian xenial main"</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian xenial main"
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"
add-apt-repository "deb http://deb.bitmask.net/debian xenial main"
apt update
apt upgrade</pre> </p> -<p><strong>Wily Werewolf (15.10)</strong></p> + +<h3><a name="ubuntu-1510-wily-werewolf"></a>Ubuntu 15.10 (Wily Werewolf)</h3> + <p><p class='b'>To install</p> -<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian wily main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> +<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian wily main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"
add-apt-repository "deb http://deb.bitmask.net/debian wily main"
apt update
apt upgrade</pre> </p> -<p><strong>Vivid Vervet (15.04)</strong></p> + +<h3><a name="ubuntu-1504-vivid-vervet"></a>Ubuntu 15.04 (Vivid Vervet)</h3> + <p><p class='b'>To install</p> -<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian vivid main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> +<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian vivid main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
add-apt-repository --remove "deb http://deb.bitmask.net/debian utopic main"
add-apt-repository "deb http://deb.bitmask.net/debian vivid main"
apt update
apt upgrade</pre> </p> -<h2><a name="debian"></a>Debian</h2> -<p>There are two ways to install bitmask on Debian, via packages and via bundles. If you are comfortable with the command line, we recommend using packages when available, otherwise use the bundle. If installed as a package, Bitmask will run faster, be better integrated in the system, and will be kept up to date.</p> -<p>For Debian, we only provide packages for Stable (Jessie/8), Testing (Stretch) and Unstable (Sid).</p> + +<h1><a name="debian-packages"></a>Debian Packages</h1> + <p>If you are using Wheezy, then you will need to use the bundle method.</p> -<h3><a name="bundle-2"></a>Bundle</h3> -<p>First determine if you running a 32 bit or 64 bit kernel by running the following command:</p> -<pre><code>uname -m</code></pre> -<p>If the result is:</p> -<ul> - <li><code>x86_64</code>, you have <strong>64 bit</strong></li> - <li><code>i686</code>, you have <strong>32 bit</strong></li> - <li><code>i386</code>, you have <strong>32 bit</strong></li> -</ul> -<p>Then download the appropriate version below:</p> -<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz'> - <i class='fa fa-cloud-download fa-lg'></i> - Download 64 bit -</a> -</p> -<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz.asc">Signature file</a></p> -<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz'> - <i class='fa fa-cloud-download fa-lg'></i> - Download 32 bit -</a> -</p> -<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz.asc">Signature file</a></p> -<p>If you want to make sure that the Bitmask wasn’t messed with during download you can <a href="/en/signature-verification">authenticate the signature</a>.</p> -<h3><a name="packages-2"></a>Packages</h3> -<p><strong>Stable (Jessie/8)</strong></p> + +<h3><a name="debian-8-stablejessie"></a>Debian 8 (Stable/Jessie)</h3> + <p><p class='b'>To install</p> -<pre>sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> +<pre>sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade
</pre> </p> -<p><strong>Testing (Stretch)</strong></p> + +<h3><a name="debian-testing-stretch"></a>Debian Testing (Stretch)</h3> + <p><p class='b'>To install</p> -<pre>sudo -s
echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> +<pre>sudo -s
echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade
</pre> </p> -<p><strong>Unstable (Sid)</strong><br /> -<p class='b'>To install</p> -<pre>sudo -s
echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> + +<h3><a name="debian-unstable-sid"></a>Debian Unstable (Sid)</h3> + +<p><p class='b'>To install</p> +<pre>sudo -s
echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade
</pre> </p> -<h2><a name="other"></a>Other</h2> -<p>Please note that we only provide support for the above versions of Debian and Ubuntu. You are welcome to try and get Bitmask running on another distribution. If you want to try, we recommend attempting to use the bundle (see below), or have a look at <a href="https://leap.se/en/docs/get-involved/source">building it from source</a>.</p> + +<h3><a name="stand-alone-bundle"></a>Stand Alone Bundle</h3> + +<p>The Bitmask stand alone bundle should work on most recent versions of Debian and Ubuntu. You are welcome to try the bundle on other distributions, it sometimes works. Alternately, you can <a href="https://leap.se/en/docs/get-involved/source">build it from source</a>.</p> + <p>First determine if you running a 32 bit or 64 bit kernel by running the following command:</p> -<pre><code>uname -m</code></pre> -<p>If the result is:</p> -<ul> - <li><code>x86_64</code>, you have <strong>64 bit</strong></li> - <li><code>i686</code>, you have <strong>32 bit</strong></li> - <li><code>i386</code>, you have <strong>32 bit</strong></li> -</ul> -<p>Then download the appropriate version below:</p> -<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz'> + +<pre><code>uname -m +</code></pre> + +<table class="table"><tr><td> + If the result is x86_64, you have <b>64 bit</b> +</td><td> + <a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz'> <i class='fa fa-cloud-download fa-lg'></i> Download 64 bit </a> -</p> -<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz.asc">Signature file</a></p> -<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz'> + +</td><td> + <a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz.asc">Signature file</a> +</td></tr><tr><td> + If the result is: i686 or i386, you have <b>32 bit</b> +</td><td> + <a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz'> <i class='fa fa-cloud-download fa-lg'></i> Download 32 bit </a> -</p> -<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz.asc">Signature file</a></p> -<p>If you want to make sure that the Bitmask wasn’t messed with during download you can <a href="/en/signature-verification">authenticate the signature</a>.</p> -<h2><a name="upgrading"></a>Upgrading</h2> -<p><strong>From stand-alone bundles</strong>: Bitmask should upgrade itself automatically (for versions equal or later than 0.7.0). If you are running a version prior to 0.7.0, you can download the new bundle and copy the “config” folder from the old bundle directory.</p> + +</td><td> + <a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz.asc">Signature file</a> +</td></tr></table> + + +<p>Optionally, you can <a href="/en/signature-verification">authenticate the signature</a> using LEAP’s archive signing key.</p> + +<p>If you want to try an experimental or release candidate versions of Bitmask, you can browse the <a href="https://dl.bitmask.net/client/linux">full list of available downloads</a>.</p> + +<h1><a name="upgrading"></a>Upgrading</h1> + +<p><strong>From stand-alone bundles</strong>: Bitmask should upgrade itself automatically (for versions equal or later than 0.7.0). If you are running a version prior to 0.7.0, you can download the new bundle and copy the “config” folder from the old bundle directory.</p> + <p><strong>From packages</strong>: If you are running from packages, then you can trigger an update like so:</p> + <pre><code>apt-get update -apt-get dist-upgrade</code></pre> -<p><strong><span class="caps">NOTE</span>:</strong> When upgrading Ubuntu from 14.10 (Utopic) to 15.04 (Vivid), you may need to run this command again:</p> -<pre><code>sudo add-apt-repository "deb <a href="http://deb.bitmask.net/debian">deb.bitmask.net/debian</a> vivid main"</code></pre> -<p>Similar is needed for the upgrade from 15.04 to 15.10 (Wily):</p> -<pre><code>sudo add-apt-repository "deb <a href="http://deb.bitmask.net/debian">deb.bitmask.net/debian</a> wily main"</code></pre> -<p>This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in <code>/etc/apt/sources.list</code>.</p> +apt-get dist-upgrade +</code></pre> + +<p><strong>NOTE:</strong> When upgrading the version of your operating system, you must also follow the directions listed under “When upgrading the OS” above.</p> + </div> <footer> <div> diff --git a/public/linux/index.es.html b/public/linux/index.es.html index 938921b..6d00eb4 100644 --- a/public/linux/index.es.html +++ b/public/linux/index.es.html @@ -22,31 +22,37 @@ Bitmask Downloads <a href="#introduction">Introduction</a> </li> <li> - <a href="#ubuntu">Ubuntu</a> + <a href="#ubuntu-packages">Ubuntu Packages</a> <ol> <li> - <a href="#bundle">Bundle</a> + <a href="#ubuntu-1604-lts-xenial-xerus">Ubuntu 16.04 LTS (Xenial Xerus)</a> </li> <li> - <a href="#packages">Packages</a> + <a href="#ubuntu-1510-wily-werewolf">Ubuntu 15.10 (Wily Werewolf)</a> + </li> + <li> + <a href="#ubuntu-1504-vivid-vervet">Ubuntu 15.04 (Vivid Vervet)</a> </li> </ol> </li> <li> - <a href="#debian">Debian</a> + <a href="#debian-packages">Debian Packages</a> <ol> <li> - <a href="#bundle-2">Bundle</a> + <a href="#debian-8-stablejessie">Debian 8 (Stable/Jessie)</a> + </li> + <li> + <a href="#debian-testing-stretch">Debian Testing (Stretch)</a> + </li> + <li> + <a href="#debian-unstable-sid">Debian Unstable (Sid)</a> </li> <li> - <a href="#packages-2">Packages</a> + <a href="#stand-alone-bundle">Stand Alone Bundle</a> </li> </ol> </li> <li> - <a href="#other">Other</a> - </li> - <li> <a href="#upgrading">Upgrading</a> </li> </ol></div> @@ -59,144 +65,136 @@ Bitmask Downloads </div> </div> </p> -<h2><a name="introduction"></a>Introduction</h2> -<p>For <span class="caps">GNU</span>/Linux, we recommend following the installation method detailed below based on what distribution you are running.</p> -<p>To find out which distribution you are running, open a terminal and type in the following:</p> -<pre><code>cat /etc/issue</code></pre> -<h2><a name="ubuntu"></a>Ubuntu</h2> -<p>There are two ways to install bitmask on Ubuntu, via packages and via bundles. If you are comfortable with the command line, we recommend using packages when available, otherwise use the bundle. If installed as a package, Bitmask will run faster, be better integrated in the desktop environment, and will be faster to start.</p> -<p>For Ubuntu, we only provide packages for Wily Werewolf (15.10) and Vivid Vervet (15.04).</p> -<p>If you are using Trusty, then you will need to use the bundle method.</p> -<p>We are sorry, Precise Penguin (12.04) is not working at this time.</p> -<h3><a name="bundle"></a>Bundle</h3> -<p>First determine if you running a 32 bit or 64 bit kernel by running the following command:</p> -<pre><code>uname -m</code></pre> -<p>If the result is:</p> -<ul> - <li><code>x86_64</code>, you have <strong>64 bit</strong></li> - <li><code>i686</code>, you have <strong>32 bit</strong></li> - <li><code>i386</code>, you have <strong>32 bit</strong></li> -</ul> -<p>Then download the appropriate version below:</p> -<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz'> - <i class='fa fa-cloud-download fa-lg'></i> - Download 64 bit -</a> -</p> -<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz.asc">Signature file</a></p> -<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz'> - <i class='fa fa-cloud-download fa-lg'></i> - Download 32 bit -</a> -</p> -<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz.asc">Signature file</a></p> -<p>If you want to make sure that the Bitmask wasn’t messed with during download you can <a href="/es/signature-verification">authenticate the signature</a>.</p> -<p><strong><span class="caps">NOTE</span>:</strong><br /> - Stand-alone bundles are useful if want to run Bitmask from a thumb drive. Or from a distribution which we don’t support with packages.<br /> - There are two disadvantages to the stand-alone bundle:</p> + +<h1><a name="introduction"></a>Introduction</h1> + +<p>There are two ways to install Bitmask on Linux, as a <strong>package</strong> or as a stand-alone <strong>bundle</strong>.</p> + <ul> - <li>The Bitmask app will be less well integrated with the desktop environment.</li> - <li>Running from the bundle is slower to start than via packages.</li> +<li><strong>Packages</strong>: run faster, and are better integrated with the desktop environment.</li> +<li><strong>Bundles</strong>: do not require root, and can be installed on a portable thumb drive.</li> </ul> -<h3><a name="packages"></a>Packages</h3> -<p><strong>Xenial Xerus (16.04)</strong></p> + + +<p>To find out which distribution you are running, open a terminal and type in the following:</p> + +<pre><code>cat /etc/issue +</code></pre> + +<h1><a name="ubuntu-packages"></a>Ubuntu Packages</h1> + +<h3><a name="ubuntu-1604-lts-xenial-xerus"></a>Ubuntu 16.04 LTS (Xenial Xerus)</h3> + <p><p class='b'>To install</p> -<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian xenial main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> +<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian xenial main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian xenial main"</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian xenial main"
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"
add-apt-repository "deb http://deb.bitmask.net/debian xenial main"
apt update
apt upgrade</pre> </p> -<p><strong>Wily Werewolf (15.10)</strong></p> + +<h3><a name="ubuntu-1510-wily-werewolf"></a>Ubuntu 15.10 (Wily Werewolf)</h3> + <p><p class='b'>To install</p> -<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian wily main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> +<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian wily main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"
add-apt-repository "deb http://deb.bitmask.net/debian wily main"
apt update
apt upgrade</pre> </p> -<p><strong>Vivid Vervet (15.04)</strong></p> + +<h3><a name="ubuntu-1504-vivid-vervet"></a>Ubuntu 15.04 (Vivid Vervet)</h3> + <p><p class='b'>To install</p> -<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian vivid main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> +<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian vivid main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
add-apt-repository --remove "deb http://deb.bitmask.net/debian utopic main"
add-apt-repository "deb http://deb.bitmask.net/debian vivid main"
apt update
apt upgrade</pre> </p> -<h2><a name="debian"></a>Debian</h2> -<p>There are two ways to install bitmask on Debian, via packages and via bundles. If you are comfortable with the command line, we recommend using packages when available, otherwise use the bundle. If installed as a package, Bitmask will run faster, be better integrated in the system, and will be kept up to date.</p> -<p>For Debian, we only provide packages for Stable (Jessie/8), Testing (Stretch) and Unstable (Sid).</p> + +<h1><a name="debian-packages"></a>Debian Packages</h1> + <p>If you are using Wheezy, then you will need to use the bundle method.</p> -<h3><a name="bundle-2"></a>Bundle</h3> -<p>First determine if you running a 32 bit or 64 bit kernel by running the following command:</p> -<pre><code>uname -m</code></pre> -<p>If the result is:</p> -<ul> - <li><code>x86_64</code>, you have <strong>64 bit</strong></li> - <li><code>i686</code>, you have <strong>32 bit</strong></li> - <li><code>i386</code>, you have <strong>32 bit</strong></li> -</ul> -<p>Then download the appropriate version below:</p> -<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz'> - <i class='fa fa-cloud-download fa-lg'></i> - Download 64 bit -</a> -</p> -<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz.asc">Signature file</a></p> -<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz'> - <i class='fa fa-cloud-download fa-lg'></i> - Download 32 bit -</a> -</p> -<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz.asc">Signature file</a></p> -<p>If you want to make sure that the Bitmask wasn’t messed with during download you can <a href="/es/signature-verification">authenticate the signature</a>.</p> -<h3><a name="packages-2"></a>Packages</h3> -<p><strong>Stable (Jessie/8)</strong></p> + +<h3><a name="debian-8-stablejessie"></a>Debian 8 (Stable/Jessie)</h3> + <p><p class='b'>To install</p> -<pre>sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> +<pre>sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade
</pre> </p> -<p><strong>Testing (Stretch)</strong></p> + +<h3><a name="debian-testing-stretch"></a>Debian Testing (Stretch)</h3> + <p><p class='b'>To install</p> -<pre>sudo -s
echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> +<pre>sudo -s
echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade
</pre> </p> -<p><strong>Unstable (Sid)</strong><br /> -<p class='b'>To install</p> -<pre>sudo -s
echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> + +<h3><a name="debian-unstable-sid"></a>Debian Unstable (Sid)</h3> + +<p><p class='b'>To install</p> +<pre>sudo -s
echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade
</pre> </p> -<h2><a name="other"></a>Other</h2> -<p>Please note that we only provide support for the above versions of Debian and Ubuntu. You are welcome to try and get Bitmask running on another distribution. If you want to try, we recommend attempting to use the bundle (see below), or have a look at <a href="https://leap.se/en/docs/get-involved/source">building it from source</a>.</p> + +<h3><a name="stand-alone-bundle"></a>Stand Alone Bundle</h3> + +<p>The Bitmask stand alone bundle should work on most recent versions of Debian and Ubuntu. You are welcome to try the bundle on other distributions, it sometimes works. Alternately, you can <a href="https://leap.se/en/docs/get-involved/source">build it from source</a>.</p> + <p>First determine if you running a 32 bit or 64 bit kernel by running the following command:</p> -<pre><code>uname -m</code></pre> -<p>If the result is:</p> -<ul> - <li><code>x86_64</code>, you have <strong>64 bit</strong></li> - <li><code>i686</code>, you have <strong>32 bit</strong></li> - <li><code>i386</code>, you have <strong>32 bit</strong></li> -</ul> -<p>Then download the appropriate version below:</p> -<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz'> + +<pre><code>uname -m +</code></pre> + +<table class="table"><tr><td> + If the result is x86_64, you have <b>64 bit</b> +</td><td> + <a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz'> <i class='fa fa-cloud-download fa-lg'></i> Download 64 bit </a> -</p> -<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz.asc">Signature file</a></p> -<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz'> + +</td><td> + <a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz.asc">Signature file</a> +</td></tr><tr><td> + If the result is: i686 or i386, you have <b>32 bit</b> +</td><td> + <a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz'> <i class='fa fa-cloud-download fa-lg'></i> Download 32 bit </a> -</p> -<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz.asc">Signature file</a></p> -<p>If you want to make sure that the Bitmask wasn’t messed with during download you can <a href="/es/signature-verification">authenticate the signature</a>.</p> -<h2><a name="upgrading"></a>Upgrading</h2> -<p><strong>From stand-alone bundles</strong>: Bitmask should upgrade itself automatically (for versions equal or later than 0.7.0). If you are running a version prior to 0.7.0, you can download the new bundle and copy the “config” folder from the old bundle directory.</p> + +</td><td> + <a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz.asc">Signature file</a> +</td></tr></table> + + +<p>Optionally, you can <a href="/es/signature-verification">authenticate the signature</a> using LEAP’s archive signing key.</p> + +<p>If you want to try an experimental or release candidate versions of Bitmask, you can browse the <a href="https://dl.bitmask.net/client/linux">full list of available downloads</a>.</p> + +<h1><a name="upgrading"></a>Upgrading</h1> + +<p><strong>From stand-alone bundles</strong>: Bitmask should upgrade itself automatically (for versions equal or later than 0.7.0). If you are running a version prior to 0.7.0, you can download the new bundle and copy the “config” folder from the old bundle directory.</p> + <p><strong>From packages</strong>: If you are running from packages, then you can trigger an update like so:</p> + <pre><code>apt-get update -apt-get dist-upgrade</code></pre> -<p><strong><span class="caps">NOTE</span>:</strong> When upgrading Ubuntu from 14.10 (Utopic) to 15.04 (Vivid), you may need to run this command again:</p> -<pre><code>sudo add-apt-repository "deb <a href="http://deb.bitmask.net/debian">deb.bitmask.net/debian</a> vivid main"</code></pre> -<p>Similar is needed for the upgrade from 15.04 to 15.10 (Wily):</p> -<pre><code>sudo add-apt-repository "deb <a href="http://deb.bitmask.net/debian">deb.bitmask.net/debian</a> wily main"</code></pre> -<p>This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in <code>/etc/apt/sources.list</code>.</p> +apt-get dist-upgrade +</code></pre> + +<p><strong>NOTE:</strong> When upgrading the version of your operating system, you must also follow the directions listed under “When upgrading the OS” above.</p> + </div> <footer> <div> diff --git a/public/linux/index.pt.html b/public/linux/index.pt.html index 9591f18..d59d145 100644 --- a/public/linux/index.pt.html +++ b/public/linux/index.pt.html @@ -22,31 +22,37 @@ Bitmask Downloads <a href="#introduction">Introduction</a> </li> <li> - <a href="#ubuntu">Ubuntu</a> + <a href="#ubuntu-packages">Ubuntu Packages</a> <ol> <li> - <a href="#bundle">Bundle</a> + <a href="#ubuntu-1604-lts-xenial-xerus">Ubuntu 16.04 LTS (Xenial Xerus)</a> </li> <li> - <a href="#packages">Packages</a> + <a href="#ubuntu-1510-wily-werewolf">Ubuntu 15.10 (Wily Werewolf)</a> + </li> + <li> + <a href="#ubuntu-1504-vivid-vervet">Ubuntu 15.04 (Vivid Vervet)</a> </li> </ol> </li> <li> - <a href="#debian">Debian</a> + <a href="#debian-packages">Debian Packages</a> <ol> <li> - <a href="#bundle-2">Bundle</a> + <a href="#debian-8-stablejessie">Debian 8 (Stable/Jessie)</a> + </li> + <li> + <a href="#debian-testing-stretch">Debian Testing (Stretch)</a> + </li> + <li> + <a href="#debian-unstable-sid">Debian Unstable (Sid)</a> </li> <li> - <a href="#packages-2">Packages</a> + <a href="#stand-alone-bundle">Stand Alone Bundle</a> </li> </ol> </li> <li> - <a href="#other">Other</a> - </li> - <li> <a href="#upgrading">Upgrading</a> </li> </ol></div> @@ -59,144 +65,136 @@ Bitmask Downloads </div> </div> </p> -<h2><a name="introduction"></a>Introduction</h2> -<p>For <span class="caps">GNU</span>/Linux, we recommend following the installation method detailed below based on what distribution you are running.</p> -<p>To find out which distribution you are running, open a terminal and type in the following:</p> -<pre><code>cat /etc/issue</code></pre> -<h2><a name="ubuntu"></a>Ubuntu</h2> -<p>There are two ways to install bitmask on Ubuntu, via packages and via bundles. If you are comfortable with the command line, we recommend using packages when available, otherwise use the bundle. If installed as a package, Bitmask will run faster, be better integrated in the desktop environment, and will be faster to start.</p> -<p>For Ubuntu, we only provide packages for Wily Werewolf (15.10) and Vivid Vervet (15.04).</p> -<p>If you are using Trusty, then you will need to use the bundle method.</p> -<p>We are sorry, Precise Penguin (12.04) is not working at this time.</p> -<h3><a name="bundle"></a>Bundle</h3> -<p>First determine if you running a 32 bit or 64 bit kernel by running the following command:</p> -<pre><code>uname -m</code></pre> -<p>If the result is:</p> -<ul> - <li><code>x86_64</code>, you have <strong>64 bit</strong></li> - <li><code>i686</code>, you have <strong>32 bit</strong></li> - <li><code>i386</code>, you have <strong>32 bit</strong></li> -</ul> -<p>Then download the appropriate version below:</p> -<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz'> - <i class='fa fa-cloud-download fa-lg'></i> - Download 64 bit -</a> -</p> -<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz.asc">Signature file</a></p> -<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz'> - <i class='fa fa-cloud-download fa-lg'></i> - Download 32 bit -</a> -</p> -<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz.asc">Signature file</a></p> -<p>If you want to make sure that the Bitmask wasn’t messed with during download you can <a href="/pt/signature-verification">authenticate the signature</a>.</p> -<p><strong><span class="caps">NOTE</span>:</strong><br /> - Stand-alone bundles are useful if want to run Bitmask from a thumb drive. Or from a distribution which we don’t support with packages.<br /> - There are two disadvantages to the stand-alone bundle:</p> + +<h1><a name="introduction"></a>Introduction</h1> + +<p>There are two ways to install Bitmask on Linux, as a <strong>package</strong> or as a stand-alone <strong>bundle</strong>.</p> + <ul> - <li>The Bitmask app will be less well integrated with the desktop environment.</li> - <li>Running from the bundle is slower to start than via packages.</li> +<li><strong>Packages</strong>: run faster, and are better integrated with the desktop environment.</li> +<li><strong>Bundles</strong>: do not require root, and can be installed on a portable thumb drive.</li> </ul> -<h3><a name="packages"></a>Packages</h3> -<p><strong>Xenial Xerus (16.04)</strong></p> + + +<p>To find out which distribution you are running, open a terminal and type in the following:</p> + +<pre><code>cat /etc/issue +</code></pre> + +<h1><a name="ubuntu-packages"></a>Ubuntu Packages</h1> + +<h3><a name="ubuntu-1604-lts-xenial-xerus"></a>Ubuntu 16.04 LTS (Xenial Xerus)</h3> + <p><p class='b'>To install</p> -<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian xenial main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> +<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian xenial main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian xenial main"</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian xenial main"
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"
add-apt-repository "deb http://deb.bitmask.net/debian xenial main"
apt update
apt upgrade</pre> </p> -<p><strong>Wily Werewolf (15.10)</strong></p> + +<h3><a name="ubuntu-1510-wily-werewolf"></a>Ubuntu 15.10 (Wily Werewolf)</h3> + <p><p class='b'>To install</p> -<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian wily main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> +<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian wily main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"
add-apt-repository "deb http://deb.bitmask.net/debian wily main"
apt update
apt upgrade</pre> </p> -<p><strong>Vivid Vervet (15.04)</strong></p> + +<h3><a name="ubuntu-1504-vivid-vervet"></a>Ubuntu 15.04 (Vivid Vervet)</h3> + <p><p class='b'>To install</p> -<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian vivid main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> +<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian vivid main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
add-apt-repository --remove "deb http://deb.bitmask.net/debian utopic main"
add-apt-repository "deb http://deb.bitmask.net/debian vivid main"
apt update
apt upgrade</pre> </p> -<h2><a name="debian"></a>Debian</h2> -<p>There are two ways to install bitmask on Debian, via packages and via bundles. If you are comfortable with the command line, we recommend using packages when available, otherwise use the bundle. If installed as a package, Bitmask will run faster, be better integrated in the system, and will be kept up to date.</p> -<p>For Debian, we only provide packages for Stable (Jessie/8), Testing (Stretch) and Unstable (Sid).</p> + +<h1><a name="debian-packages"></a>Debian Packages</h1> + <p>If you are using Wheezy, then you will need to use the bundle method.</p> -<h3><a name="bundle-2"></a>Bundle</h3> -<p>First determine if you running a 32 bit or 64 bit kernel by running the following command:</p> -<pre><code>uname -m</code></pre> -<p>If the result is:</p> -<ul> - <li><code>x86_64</code>, you have <strong>64 bit</strong></li> - <li><code>i686</code>, you have <strong>32 bit</strong></li> - <li><code>i386</code>, you have <strong>32 bit</strong></li> -</ul> -<p>Then download the appropriate version below:</p> -<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz'> - <i class='fa fa-cloud-download fa-lg'></i> - Download 64 bit -</a> -</p> -<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz.asc">Signature file</a></p> -<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz'> - <i class='fa fa-cloud-download fa-lg'></i> - Download 32 bit -</a> -</p> -<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz.asc">Signature file</a></p> -<p>If you want to make sure that the Bitmask wasn’t messed with during download you can <a href="/pt/signature-verification">authenticate the signature</a>.</p> -<h3><a name="packages-2"></a>Packages</h3> -<p><strong>Stable (Jessie/8)</strong></p> + +<h3><a name="debian-8-stablejessie"></a>Debian 8 (Stable/Jessie)</h3> + <p><p class='b'>To install</p> -<pre>sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> +<pre>sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade
</pre> </p> -<p><strong>Testing (Stretch)</strong></p> + +<h3><a name="debian-testing-stretch"></a>Debian Testing (Stretch)</h3> + <p><p class='b'>To install</p> -<pre>sudo -s
echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> +<pre>sudo -s
echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade
</pre> </p> -<p><strong>Unstable (Sid)</strong><br /> -<p class='b'>To install</p> -<pre>sudo -s
echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> + +<h3><a name="debian-unstable-sid"></a>Debian Unstable (Sid)</h3> + +<p><p class='b'>To install</p> +<pre>sudo -s
echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade
</pre> </p> -<h2><a name="other"></a>Other</h2> -<p>Please note that we only provide support for the above versions of Debian and Ubuntu. You are welcome to try and get Bitmask running on another distribution. If you want to try, we recommend attempting to use the bundle (see below), or have a look at <a href="https://leap.se/en/docs/get-involved/source">building it from source</a>.</p> + +<h3><a name="stand-alone-bundle"></a>Stand Alone Bundle</h3> + +<p>The Bitmask stand alone bundle should work on most recent versions of Debian and Ubuntu. You are welcome to try the bundle on other distributions, it sometimes works. Alternately, you can <a href="https://leap.se/en/docs/get-involved/source">build it from source</a>.</p> + <p>First determine if you running a 32 bit or 64 bit kernel by running the following command:</p> -<pre><code>uname -m</code></pre> -<p>If the result is:</p> -<ul> - <li><code>x86_64</code>, you have <strong>64 bit</strong></li> - <li><code>i686</code>, you have <strong>32 bit</strong></li> - <li><code>i386</code>, you have <strong>32 bit</strong></li> -</ul> -<p>Then download the appropriate version below:</p> -<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz'> + +<pre><code>uname -m +</code></pre> + +<table class="table"><tr><td> + If the result is x86_64, you have <b>64 bit</b> +</td><td> + <a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz'> <i class='fa fa-cloud-download fa-lg'></i> Download 64 bit </a> -</p> -<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz.asc">Signature file</a></p> -<p><a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz'> + +</td><td> + <a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz.asc">Signature file</a> +</td></tr><tr><td> + If the result is: i686 or i386, you have <b>32 bit</b> +</td><td> + <a class='btn btn-primary btn-large' href='https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz'> <i class='fa fa-cloud-download fa-lg'></i> Download 32 bit </a> -</p> -<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz.asc">Signature file</a></p> -<p>If you want to make sure that the Bitmask wasn’t messed with during download you can <a href="/pt/signature-verification">authenticate the signature</a>.</p> -<h2><a name="upgrading"></a>Upgrading</h2> -<p><strong>From stand-alone bundles</strong>: Bitmask should upgrade itself automatically (for versions equal or later than 0.7.0). If you are running a version prior to 0.7.0, you can download the new bundle and copy the “config” folder from the old bundle directory.</p> + +</td><td> + <a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz.asc">Signature file</a> +</td></tr></table> + + +<p>Optionally, you can <a href="/pt/signature-verification">authenticate the signature</a> using LEAP’s archive signing key.</p> + +<p>If you want to try an experimental or release candidate versions of Bitmask, you can browse the <a href="https://dl.bitmask.net/client/linux">full list of available downloads</a>.</p> + +<h1><a name="upgrading"></a>Upgrading</h1> + +<p><strong>From stand-alone bundles</strong>: Bitmask should upgrade itself automatically (for versions equal or later than 0.7.0). If you are running a version prior to 0.7.0, you can download the new bundle and copy the “config” folder from the old bundle directory.</p> + <p><strong>From packages</strong>: If you are running from packages, then you can trigger an update like so:</p> + <pre><code>apt-get update -apt-get dist-upgrade</code></pre> -<p><strong><span class="caps">NOTE</span>:</strong> When upgrading Ubuntu from 14.10 (Utopic) to 15.04 (Vivid), you may need to run this command again:</p> -<pre><code>sudo add-apt-repository "deb <a href="http://deb.bitmask.net/debian">deb.bitmask.net/debian</a> vivid main"</code></pre> -<p>Similar is needed for the upgrade from 15.04 to 15.10 (Wily):</p> -<pre><code>sudo add-apt-repository "deb <a href="http://deb.bitmask.net/debian">deb.bitmask.net/debian</a> wily main"</code></pre> -<p>This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in <code>/etc/apt/sources.list</code>.</p> +apt-get dist-upgrade +</code></pre> + +<p><strong>NOTE:</strong> When upgrading the version of your operating system, you must also follow the directions listed under “When upgrading the OS” above.</p> + </div> <footer> <div> diff --git a/public/linux/index.ru.html b/public/linux/index.ru.html index 58cb251..1ecdcd5 100644 --- a/public/linux/index.ru.html +++ b/public/linux/index.ru.html @@ -68,27 +68,35 @@ apt-get dist-upgrade</code></pre> <p>Это рекомендуемый способ установки Bitmask. При установке в качестве пакета Bitmask будет работать быстрее, будет лучше интегрирована с системой, а также будет постоянно обновляться.</p> <h3><a name="ubuntu-1604-xenial-xerus"></a>Ubuntu 16.04 (Xenial Xerus)</h3> <p><p class='b'>Для установки</p> -<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian xenial main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> +<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian xenial main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>Для удаления</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian xenial main"</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian xenial main"
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"
add-apt-repository "deb http://deb.bitmask.net/debian xenial main"
apt update
apt upgrade</pre> </p> <h3><a name="ubuntu-1510-wily-werewolf"></a>Ubuntu 15.10 (Wily Werewolf)</h3> <p><p class='b'>Для установки</p> -<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian wily main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> +<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian wily main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>Для удаления</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"
add-apt-repository "deb http://deb.bitmask.net/debian wily main"
apt update
apt upgrade</pre> </p> <h3><a name="ubuntu-1504-vivid-vervet"></a>Ubuntu 15.04 (Vivid Vervet)</h3> <p><p class='b'>Для установки</p> -<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian vivid main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> +<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian vivid main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>Для удаления</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
add-apt-repository --remove "deb http://deb.bitmask.net/debian utopic main"
add-apt-repository "deb http://deb.bitmask.net/debian vivid main"
apt update
apt upgrade</pre> </p> <h3><a name="debian-80-jessie"></a>Debian 8.0 (Jessie)</h3> <p><p class='b'>Для установки</p> -<pre>sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-archive-keyring
</pre> +<pre>sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
</pre> <p class='b'>Для удаления</p> -<pre>sudo -s
apt-get remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<p class='b'>When upgrading to this OS</p> +<pre>sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade
</pre> </p> <h2><a name="%D0%A3%D1%81%D1%82%D0%B0%D0%BD%D0%BE%D0%B2%D0%B8%D1%82%D1%8C-%D0%B8%D0%B7-%D0%B0%D1%80%D1%85%D0%B8%D0%B2%D0%B0"></a>Установить из архива</h2> <p>Кроме того, вы можете запустить Bitmask из автономного архива. Это полезно, если вы хотите запустить Bitmask с флешки. Приложение из архива должно работать на большинстве современных дистрибутивов Linux, которые являются производными от Debian (напр., Ubuntu, Mint, Trisquel, и т.д.).</p> |