From 54feea4a7e4730629f0f77eafa1164901cbcadbd Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Wed, 29 Mar 2017 22:31:36 +0200 Subject: [PATCH] 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). --- _docs/repositories | 10 +++++----- docs/repositories.html | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/_docs/repositories b/_docs/repositories index d70c7d2..8b78a3c 100644 --- 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: --------------------------------------------------------------------------------- -# 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 diff --git a/docs/repositories.html b/docs/repositories.html index 92795b3..3db334e 100644 --- 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:

-
# 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 this repository. See Ubuntu releases for details.

-- 2.39.5