summaryrefslogtreecommitdiff
path: root/pages/linux
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-07-01 15:52:48 -0700
committerelijah <elijah@riseup.net>2014-07-01 15:52:48 -0700
commitc8abaabe42c66cd76651a8bec7cbe5d0fa594340 (patch)
tree22d1468d8b21f863b009c367c632914d5e3233cc /pages/linux
parent1408a52c3d249d28011bd262061f9cc05c0b686b (diff)
fixed problems with debian wheezy instructions
Diffstat (limited to 'pages/linux')
-rw-r--r--pages/linux/_via_packages.html.haml4
-rw-r--r--pages/linux/en.md14
2 files changed, 15 insertions, 3 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