diff options
-rw-r--r-- | pages/linux/en.text | 19 | ||||
-rw-r--r-- | public/linux/index.en.html | 24 |
2 files changed, 43 insertions, 0 deletions
diff --git a/pages/linux/en.text b/pages/linux/en.text index bc2e0ae..ff9178d 100644 --- a/pages/linux/en.text +++ b/pages/linux/en.text @@ -3,10 +3,29 @@ <%= render({:partial => 'common/notice'}, {:type => 'info', :text => '<b>NOTE:</b> Encrypted email support in Bitmask is still experimental.'}) %> +h2. Upgrading + +*From stand-alone bundles*: 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. + +*From packages*: If you are running from packages, then you can trigger an update like so: + +bc. apt-get update +apt-get dist-upgrade + +NOTE: When upgrading Ubuntu from Trusty to Unicorn, you may need to run this command again: + +bc. sudo add-apt-repository "deb http://deb.bitmask.net/debian utopic main" + +This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in @/etc/apt/sources.list@. + h2. Install as packages This is the recommended method of installing Bitmask. If installed as a package, Bitmask will run faster, be better integrated in the system, and will be kept up to date. +h3. Ubuntu 14.04 (Utopic Unicorn) + +<%= render({:partial => 'via_packages'}, {:distro => 'utopic'}) %> + h3. Ubuntu 14.04 (Trusty Tahr) <%= render({:partial => 'via_packages'}, {:distro => 'trusty'}) %> diff --git a/public/linux/index.en.html b/public/linux/index.en.html index e96c6f9..c0e1a8e 100644 --- a/public/linux/index.en.html +++ b/public/linux/index.en.html @@ -19,9 +19,15 @@ Bitmask Downloads <div class='bm-main container'> <div id="TOC"><ol> <li> + <a href="#upgrading">Upgrading</a> + </li> + <li> <a href="#install-as-packages">Install as packages</a> <ol> <li> + <a href="#ubuntu-1404-utopic-unicorn">Ubuntu 14.04 (Utopic Unicorn)</a> + </li> + <li> <a href="#ubuntu-1404-trusty-tahr">Ubuntu 14.04 (Trusty Tahr)</a> </li> <li> @@ -56,8 +62,26 @@ Bitmask Downloads </div> </div> </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> +<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><span class="caps">NOTE</span>: When upgrading Ubuntu from Trusty to Unicorn, 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> utopic 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> <h2><a name="install-as-packages"></a>Install as packages</h2> <p>This is the recommended method of installing Bitmask. If installed as a package, Bitmask will run faster, be better integrated in the system, and will be kept up to date.</p> +<h3><a name="ubuntu-1404-utopic-unicorn"></a>Ubuntu 14.04 (Utopic Unicorn)</h3> +<p><p class='b'> + To install +</p> +<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian utopic main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-keyring
</pre> +<p class='b'> + To remove +</p> +<pre>sudo -s
apt-get remove bitmask leap-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian utopic main"</pre> +</p> <h3><a name="ubuntu-1404-trusty-tahr"></a>Ubuntu 14.04 (Trusty Tahr)</h3> <p><p class='b'> To install |