From c8abaabe42c66cd76651a8bec7cbe5d0fa594340 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Tue, 1 Jul 2014 15:52:48 -0700
Subject: fixed problems with debian wheezy instructions

---
 pages/linux/_via_packages.html.haml |  4 +++-
 pages/linux/en.md                   | 14 ++++++++++++--
 public/linux/index.en.html          | 16 ++++++++++++++--
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/pages/linux/_via_packages.html.haml b/pages/linux/_via_packages.html.haml
index b70c2fc..3b8e13f 100644
--- a/pages/linux/_via_packages.html.haml
+++ b/pages/linux/_via_packages.html.haml
@@ -1,3 +1,5 @@
+- @fetch = @locals[:os] == 'debian' ? 'wget -O-' : 'curl'
+
 %p.b
   To install
 
@@ -5,7 +7,7 @@
   :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 -
+    #{@fetch} https://dl.bitmask.net/apt.key | apt-key add -
     apt-get update
     apt-get install bitmask leap-keyring
 
diff --git a/pages/linux/en.md b/pages/linux/en.md
index 111b8ad..4a9b4c7 100644
--- a/pages/linux/en.md
+++ b/pages/linux/en.md
@@ -20,11 +20,21 @@ This is the recommended method of installing Bitmask. If installed as a package,
 
 ### Debian 7.0 (Wheezy)
 
-<%= render({:partial => 'via_packages'}, {:distro => 'wheezy'}) %>
+For wheezy, you must have `wheezy-backports` enabled as a software source in `/etc/apt/sources.list`. For example:
+
+    deb http://ftp.debian.org/debian wheezy-backports main contrib non-free
+
+Or, if you have faith in shell:
+
+    grep wheezy-backports /etc/apt/sources.list || grep "^deb .*debian\.org.*wheezy main" /etc/apt/sources.list | sed 's/wheezy/wheezy-backports/' >> /etc/apt/sources.list
+
+For instructions on adding backports via a user interface, see the [Debian backports page](https://wiki.debian.org/Backports).
+
+<%= render({:partial => 'via_packages'}, {:distro => 'wheezy', :os => 'debian'}) %>
 
 ### Debian 8.0 (Jessie)
 
-<%= render({:partial => 'via_packages'}, {:distro => 'jessie'}) %>
+<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian'}) %>
 
 ## Install stand-alone bundle
 
diff --git a/public/linux/index.en.html b/public/linux/index.en.html
index 56fee0d..c977a5c 100644
--- a/public/linux/index.en.html
+++ b/public/linux/index.en.html
@@ -116,10 +116,22 @@ 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>. For example:</p>
+
+<pre><code>deb http://ftp.debian.org/debian wheezy-backports main contrib non-free
+</code></pre>
+
+<p>Or, if you have faith in shell:</p>
+
+<pre><code>grep wheezy-backports /etc/apt/sources.list || grep "^deb .*debian\.org.*wheezy main" /etc/apt/sources.list | sed 's/wheezy/wheezy-backports/' &gt;&gt; /etc/apt/sources.list
+</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><p class='b'>
   To install
 </p>
-<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian wheezy main"&#x000A;curl 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;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>
 <p class='b'>
   To remove
 </p>
@@ -131,7 +143,7 @@ Downloads
 <p><p class='b'>
   To install
 </p>
-<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian jessie main"&#x000A;curl 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;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>
 <p class='b'>
   To remove
 </p>
-- 
cgit v1.2.3