From a79c2ac65ed2bb0f7d537182256982779e0075d7 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 2 Jul 2014 14:08:16 -0700
Subject: Yet again modified instructions for wheezy.

---
 pages/linux/_via_packages.html.haml | 74 +++++++++++++++++++++++++++----------
 pages/linux/en.md                   |  7 +---
 2 files changed, 55 insertions(+), 26 deletions(-)

(limited to 'pages/linux')

diff --git a/pages/linux/_via_packages.html.haml b/pages/linux/_via_packages.html.haml
index 3b8e13f..944b341 100644
--- 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
--- 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'}) %>
 
-- 
cgit v1.2.3