From 7e81a5c2603ad7d52b74c0cc5daf102e06c4a841 Mon Sep 17 00:00:00 2001
From: kwadronaut <kwadronaut@leap.se>
Date: Mon, 13 Mar 2017 17:15:26 +0100
Subject: sync install instructions from dl.bitmask

---
 pages/install/linux/_via_packages.html.haml | 13 +++++++++----
 pages/install/linux/en.md                   |  7 ++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pages/install/linux/_via_packages.html.haml b/pages/install/linux/_via_packages.html.haml
index 3c0dae2..727318f 100644
--- a/pages/install/linux/_via_packages.html.haml
+++ b/pages/install/linux/_via_packages.html.haml
@@ -3,12 +3,18 @@
   %p.b= t :to_install
 
   %pre
-    :preserve
+    - if @locals[:backport] == 'true'
+      Follow [[instructions for activating Debian Backports => https://backports.debian.org/Instructions]].
+      sudo -s
+      apt install -t #{@locals[:distro]}-backports leap-archive-keyring
+      \
+    - else
       sudo -s
+      apt install leap-archive-keyring
+    :preserve
       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 update
-      apt install bitmask leap-archive-keyring
+      apt install bitmask
 
   %p.b= t :to_remove
 
@@ -16,7 +22,6 @@
     :preserve
       sudo -s
       apt remove bitmask leap-archive-keyring
-      apt-key del 0x1E34A1828E207901
       rm /etc/apt/sources.list.d/bitmask.list
 
   %p.b= t :upgrade_os
diff --git a/pages/install/linux/en.md b/pages/install/linux/en.md
index 19f668c..f1eb444 100644
--- a/pages/install/linux/en.md
+++ b/pages/install/linux/en.md
@@ -34,7 +34,7 @@ If you are using Wheezy, then you will need to use the bundle method.
 
 ### Debian 8 (Stable/Jessie)
 
-<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian'}) %>
+<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian', :backport => 'true'}) %>
 
 ### Debian Testing (Stretch)
 
@@ -72,3 +72,8 @@ If you want to try an experimental or release candidate versions of Bitmask, you
     apt-get dist-upgrade
 
 **NOTE:** When upgrading the version of your operating system, you must also follow the directions listed under "When upgrading the OS" above.
+
+# Latest builds
+For the more adventurous we make stand alone bundle builds available after each commit or merge. Currently best tested again cdev.bitmask.net, because of ongoing changes of Soledad. 
+
+  <%= render({:partial => 'common/download_button'}, {:link => 'https://0xacab.org/leap/bitmask-dev/builds/artifacts/master/download?job=bitmask_latest_bundle', :text => 'Download latest experimental bundle'}) %>
-- 
cgit v1.2.3