diff options
author | elijah <elijah@riseup.net> | 2016-05-19 12:12:08 -0700 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2016-05-19 12:12:08 -0700 |
commit | abf53bfd86fd488519a80713cdd577e06bedc265 (patch) | |
tree | 9b4561e97add357ba20c92add058af0d643e6e9e /pages/install/linux/_via_packages.html.haml | |
parent | 12aba6355f0093393552c2c9aa95d731d443e83e (diff) |
updated install instructions
Diffstat (limited to 'pages/install/linux/_via_packages.html.haml')
-rw-r--r-- | pages/install/linux/_via_packages.html.haml | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/pages/install/linux/_via_packages.html.haml b/pages/install/linux/_via_packages.html.haml index ca009e2..3c0dae2 100644 --- a/pages/install/linux/_via_packages.html.haml +++ b/pages/install/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 + |