diff options
author | elijah <elijah@riseup.net> | 2014-07-01 15:52:48 -0700 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2014-07-01 15:52:48 -0700 |
commit | c8abaabe42c66cd76651a8bec7cbe5d0fa594340 (patch) | |
tree | 22d1468d8b21f863b009c367c632914d5e3233cc | |
parent | 1408a52c3d249d28011bd262061f9cc05c0b686b (diff) |
fixed problems with debian wheezy instructions
-rw-r--r-- | pages/linux/_via_packages.html.haml | 4 | ||||
-rw-r--r-- | pages/linux/en.md | 14 | ||||
-rw-r--r-- | 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/' >> /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
add-apt-repository "deb http://deb.bitmask.net/debian wheezy main"
curl https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-keyring
</pre> +<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian wheezy 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> @@ -131,7 +143,7 @@ Downloads <p><p class='b'> To install </p> -<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian jessie main"
curl https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-keyring
</pre> +<pre>sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian jessie 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> |