diff options
author | elijah <elijah@riseup.net> | 2016-05-19 12:09:47 -0700 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2016-05-19 12:09:47 -0700 |
commit | e5ea4fdfb04aab0c5701905cfc037c38b45bb8bd (patch) | |
tree | 76d85855e2a508f573d971c58cc682cc2373ba4f /pages/linux/_via_packages.html.haml | |
parent | efcaf65ea6af5f30dd504afbe766e8aa2732e32b (diff) |
cleaned up linux install page
Diffstat (limited to 'pages/linux/_via_packages.html.haml')
-rw-r--r-- | pages/linux/_via_packages.html.haml | 34 |
1 files changed, 28 insertions, 6 deletions
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 + |