Yet again modified instructions for wheezy.

diff --git a/pages/linux/_via_packages.html.haml b/pages/linux/_via_packages.html.haml
index 3b8e13f..944b341 100644 (file)
--- a/pages/linux/_via_packages.html.haml
+++ b/pages/linux/_via_packages.html.haml
@@ -1,22 +1,56 @@
 - @fetch = @locals[:os] == 'debian' ? 'wget -O-' : 'curl'
 
-%p.b
-  To install
-
-%pre
-  :preserve
-    sudo -s
-    add-apt-repository "deb http://deb.bitmask.net/debian #{@locals[:distro]} main"
-    #{@fetch} https://dl.bitmask.net/apt.key | apt-key add -
-    apt-get update
-    apt-get install bitmask leap-keyring
-
-%p.b
-  To remove
-
-%pre
-  :preserve
-    sudo -s
-    apt-get remove bitmask leap-keyring
-    apt-key del 0x1E34A1828E207901
-    add-apt-repository --remove "deb http://deb.bitmask.net/debian #{@locals[:distro]} main"
+- if @locals[:os] == 'debian'
+
+  %p.b
+    To install
+
+  %pre
+    - if @locals[:distro] == 'wheezy'
+      :preserve
+        sudo -s
+        echo "deb http://deb.bitmask.net/debian #{@locals[:distro]} main" > /etc/apt/sources.list.d/bitmask.list
+        echo "deb http://http.debian.net/debian wheezy-backports 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-keyring
+    - else
+      :preserve
+        sudo -s
+        echo "deb http://deb.bitmask.net/debian #{@locals[:distro]} 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-keyring
+
+  %p.b
+    To remove
+
+  %pre
+    :preserve
+      sudo -s
+      apt-get remove bitmask leap-keyring
+      apt-key del 0x1E34A1828E207901
+      rm /etc/apt/sources.list.d/bitmask.list
+
+- else
+
+  %p.b
+    To install
+
+  %pre
+    :preserve
+      sudo -s
+      add-apt-repository "deb http://deb.bitmask.net/debian #{@locals[:distro]} main"
+      curl https://dl.bitmask.net/apt.key | apt-key add -
+      apt-get update
+      apt-get install bitmask leap-keyring
+
+  %p.b
+    To remove
+
+  %pre
+    :preserve
+      sudo -s
+      apt-get remove bitmask leap-keyring
+      apt-key del 0x1E34A1828E207901
+      add-apt-repository --remove "deb http://deb.bitmask.net/debian #{@locals[:distro]} main"

diff --git a/pages/linux/en.md b/pages/linux/en.md
index e96a17a..aecd09d 100644 (file)
--- a/pages/linux/en.md
+++ b/pages/linux/en.md
@@ -20,12 +20,7 @@ This is the recommended method of installing Bitmask. If installed as a package,
 
 ### Debian 7.0 (Wheezy)
 
-For wheezy, you must have `wheezy-backports` enabled as a software source in `/etc/apt/sources.list`. If you don't have backports enabled, you can add it like so:
-
-    sudo apt-get install python-software-properties
-    sudo add-apt-repository 'deb http://http.debian.net/debian wheezy-backports main'
-
-For instructions on adding backports via a user interface, see the [Debian backports page](https://wiki.debian.org/Backports).
+Note: for wheezy, these instructions will enable `wheezy-backports`, causing your computer to install more up-to-date versions of many packages. For more information, see the [Debian backports page](https://wiki.debian.org/Backports).
 
 <%= render({:partial => 'via_packages'}, {:distro => 'wheezy', :os => 'debian'}) %>
 

diff --git a/public/linux/index.en.html b/public/linux/index.en.html
index a860729..fcde31d 100644 (file)
--- a/public/linux/index.en.html
+++ b/public/linux/index.en.html
@@ -116,22 +116,16 @@ Downloads
 
 <h3><a name="debian-70-wheezy"></a>Debian 7.0 (Wheezy)</h3>
 
-<p>For wheezy, you must have <code>wheezy-backports</code> enabled as a software source in <code>/etc/apt/sources.list</code>. If you don&rsquo;t have backports enabled, you can add it like so:</p>
-
-<pre><code>sudo apt-get install python-software-properties
-sudo add-apt-repository 'deb http://http.debian.net/debian wheezy-backports main'
-</code></pre>
-
-<p>For instructions on adding backports via a user interface, see the <a href="https://wiki.debian.org/Backports">Debian backports page</a>.</p>
+<p>Note: for wheezy, these instructions will enable <code>wheezy-backports</code>, causing your computer to install more up-to-date versions of many packages. For more information, see the <a href="https://wiki.debian.org/Backports">Debian backports page</a>.</p>
 
 <p><p class='b'>
   To install
 </p>
-<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian wheezy main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
+<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian wheezy main" > /etc/apt/sources.list.d/bitmask.list&#x000A;echo "deb http://http.debian.net/debian wheezy-backports main" >> /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring</pre>
 <p class='b'>
   To remove
 </p>
-<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian wheezy main"</pre>
+<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
 </p>
 
 <h3><a name="debian-80-jessie"></a>Debian 8.0 (Jessie)</h3>
@@ -139,11 +133,11 @@ sudo add-apt-repository 'deb http://http.debian.net/debian wheezy-backports main
 <p><p class='b'>
   To install
 </p>
-<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian jessie main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
+<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
 <p class='b'>
   To remove
 </p>
-<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian jessie main"</pre>
+<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
 </p>
 
 <h2><a name="install-stand-alone-bundle"></a>Install stand-alone bundle</h2>