repositories: authenticated installation instructions for ubuntu

These instructions were used for the Debian repositories, but we
neglected to also use them for Ubuntu.

Also, while at it, use a separate file in /etc/apt/sources.list.d
instead of appending to the system-wide /etc/apt/sources.list, and use
grep+cut instead of lsb_release(1) which may not be installed on
minimal Ubuntu installations (the xenial Docker image lacks it, for
example).

diff --git a/_docs/repositories b/_docs/repositories
index d70c7d2461ed23a8a2655d537cc42a8ea0c3b730..8b78a3cb572377aa694aa1414b13708d0bbc75ae 100644 (file)
--- a/_docs/repositories
+++ b/_docs/repositories
@@ -34,11 +34,11 @@ This Ubuntu repository is provided by sur5r and contains the latest stable
 release of i3. To use it, run the following commands:
 
 ---------------------------------------------------------------------------------
 release of i3. To use it, run the following commands:
 
 ---------------------------------------------------------------------------------

-# echo "deb http://debian.sur5r.net/i3/ $(lsb_release -c -s) universe" >> /etc/apt/sources.list
-# apt-get update
-# apt-get --allow-unauthenticated install sur5r-keyring
-# apt-get update
-# apt-get install i3
+$ /usr/lib/apt/apt-helper download-file http://debian.sur5r.net/i3/pool/main/s/sur5r-keyring/sur5r-keyring_2017.01.02_all.deb keyring.deb SHA256:4c3c6685b1181d83efe3a479c5ae38a2a44e23add55e16a328b8c8560bf05e5f
+# apt install ./keyring.deb
+# echo "deb http://debian.sur5r.net/i3/ $(grep '^DISTRIB_CODENAME=' /etc/lsb-release | cut -f2 -d=) universe" >> /etc/apt/sources.list.d/sur5r-i3.list
+# apt update
+# apt install i3

 ---------------------------------------------------------------------------------
 
 All Ubuntu versions which are currently supported by Ubuntu itself are also supported by
 ---------------------------------------------------------------------------------
 
 All Ubuntu versions which are currently supported by Ubuntu itself are also supported by

diff --git a/docs/repositories.html b/docs/repositories.html
index 92795b3bc81240340a7536477c8a274d8afbffb8..3db334e09895ce455c9ee20389fda66a64c57bd0 100644 (file)
--- a/docs/repositories.html
+++ b/docs/repositories.html
@@ -87,11 +87,11 @@ If you want the latest i3 development version
 release of i3. To use it, run the following commands:</p></div>\r
 <div class="listingblock">\r
 <div class="content">\r
 release of i3. To use it, run the following commands:</p></div>\r
 <div class="listingblock">\r
 <div class="content">\r

-<pre><tt># echo "deb http://debian.sur5r.net/i3/ $(lsb_release -c -s) universe" &gt;&gt; /etc/apt/sources.list\r
-# apt-get update\r
-# apt-get --allow-unauthenticated install sur5r-keyring\r
-# apt-get update\r
-# apt-get install i3</tt></pre>\r
+<pre><tt>$ /usr/lib/apt/apt-helper download-file http://debian.sur5r.net/i3/pool/main/s/sur5r-keyring/sur5r-keyring_2017.01.02_all.deb keyring.deb SHA256:4c3c6685b1181d83efe3a479c5ae38a2a44e23add55e16a328b8c8560bf05e5f\r
+# apt install ./keyring.deb\r
+# echo "deb http://debian.sur5r.net/i3/ $(grep '^DISTRIB_CODENAME=' /etc/lsb-release | cut -f2 -d=) universe" &gt;&gt; /etc/apt/sources.list.d/sur5r-i3.list\r
+# apt update\r
+# apt install i3</tt></pre>\r

 </div></div>\r
 <div class="paragraph"><p>All Ubuntu versions which are currently supported by Ubuntu itself are also supported by\r
 this repository. See <a href="https://wiki.ubuntu.com/Releases">Ubuntu releases</a> for details.</p></div>\r
 </div></div>\r
 <div class="paragraph"><p>All Ubuntu versions which are currently supported by Ubuntu itself are also supported by\r
 this repository. See <a href="https://wiki.ubuntu.com/Releases">Ubuntu releases</a> for details.</p></div>\r