From e5ea4fdfb04aab0c5701905cfc037c38b45bb8bd Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Thu, 19 May 2016 12:09:47 -0700
Subject: cleaned up linux install page

---
 pages/linux/_via_packages.html.haml | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

(limited to 'pages/linux/_via_packages.html.haml')

diff --git a/pages/linux/_via_packages.html.haml b/pages/linux/_via_packages.html.haml
index ca009e2..3c0dae2 100644
--- a/pages/linux/_via_packages.html.haml
+++ b/pages/linux/_via_packages.html.haml
@@ -7,20 +7,31 @@
       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-archive-keyring
+      apt update
+      apt install bitmask leap-archive-keyring
 
   %p.b= t :to_remove
 
   %pre
     :preserve
       sudo -s
-      apt-get remove bitmask leap-archive-keyring
+      apt remove bitmask leap-archive-keyring
       apt-key del 0x1E34A1828E207901
       rm /etc/apt/sources.list.d/bitmask.list
 
+  %p.b= t :upgrade_os
+
+  %pre
+    :preserve
+      sudo -s
+      echo "deb http://deb.bitmask.net/debian #{@locals[:distro]} main" > /etc/apt/sources.list.d/bitmask.list
+      apt update
+      apt upgrade
+
 - else
 
+  - prior = {"xenial" => "wily", "wily" => "vivid", "vivid" => "utopic"}
+
   %p.b= t :to_install
 
   %pre
@@ -28,14 +39,25 @@
       sudo -s
       add-apt-repository "deb http://deb.bitmask.net/debian #{@locals[:distro]} main"
       wget -O- https://dl.bitmask.net/apt.key | apt-key add -
-      apt-get update
-      apt-get install bitmask leap-archive-keyring
+      apt update
+      apt install bitmask leap-archive-keyring
 
   %p.b= t :to_remove
 
   %pre
     :preserve
       sudo -s
-      apt-get remove bitmask leap-archive-keyring
+      apt remove bitmask leap-archive-keyring
       apt-key del 0x1E34A1828E207901
       add-apt-repository --remove "deb http://deb.bitmask.net/debian #{@locals[:distro]} main"
+
+  %p.b= t :upgrade_os
+
+  %pre
+    :preserve
+      sudo -s
+      add-apt-repository --remove "deb http://deb.bitmask.net/debian #{prior[@locals[:distro]]} main"
+      add-apt-repository "deb http://deb.bitmask.net/debian #{@locals[:distro]} main"
+      apt update
+      apt upgrade
+
-- 
cgit v1.2.3