YunoHost/install_script
1
0
Fork 0
mirror of https://github.com/YunoHost/install_script.git synced 2024-09-03 20:06:25 +02:00
Code Issues Projects Releases Packages Wiki Activity

replace apt-key usage with separate keyring

Browse source 
apt-key has been deprecated and it will be supported only till April
2022.

this changeset follows
https://wiki.debian.org/DebianRepository/UseThirdParty to replace the
usage of apt-key with using a separate dedicated keyring specifically
for YunoHost. This changeset also adds the 'signed-by' tag for the
repository as recommended.

Also, the dependency on wget has been eliminated
This commit is contained in:
shine 2021-07-01 00:15:35 +05:30 • committed by Alexandre Aubin
parent d99d6557d8
commit e7610b060a
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bullseye
View file

@ -304,7 +304,7 @@ function upgrade_system() {
function install_script_dependencies() { function install_script_dependencies() {
# dependencies of the install script itself # dependencies of the install script itself
local DEPENDENCIES="lsb-release wget whiptail gnupg apt-transport-https" local DEPENDENCIES="lsb-release whiptail gnupg apt-transport-https"
if [[ "$AUTOMODE" == "0" ]] ; if [[ "$AUTOMODE" == "0" ]] ;
then then
@ -399,7 +399,7 @@ function setup_package_source() {
# Debian repository # Debian repository
local CUSTOMDEB="deb http://forge.yunohost.org/debian/ bullseye stable" local CUSTOMDEB="deb [signed-by=/usr/share/keyrings/yunohost-archive-keyring.gpg] http://forge.yunohost.org/debian/ bullseye stable"
if [[ "$DISTRIB" == "stable" ]] ; then if [[ "$DISTRIB" == "stable" ]] ; then
echo "$CUSTOMDEB" > $CUSTOMAPT echo "$CUSTOMDEB" > $CUSTOMAPT
@ -410,7 +410,8 @@ function setup_package_source() {
fi fi
# Add YunoHost repository key to the keyring # Add YunoHost repository key to the keyring
wget -O- https://forge.yunohost.org/yunohost_bullseye.asc -q | apt-key add -qq - >/dev/null 2>&1 curl --fail --silent https://forge.yunohost.org/yunohost.asc | gpg --dearmor > /usr/share/keyrings/yunohost-archive-keyring.gpg
apt-get -qq update
} }
function register_debconf() { function register_debconf() {