mirror of
https://github.com/YunoHost/install_script.git
synced 2024-09-03 20:06:25 +02:00
Merge pull request #66 from shinenelson/replace-apt-key-usage
replace apt-key usage with separate keyring
This commit is contained in:
commit
e5ab0e8729
1 changed files with 4 additions and 3 deletions
7
install_yunohost
Executable file → Normal file
7
install_yunohost
Executable file → Normal file
|
@ -300,7 +300,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
|
||||||
|
@ -395,7 +395,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
|
||||||
|
@ -406,7 +406,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() {
|
||||||
|
|
Loading…
Add table
Reference in a new issue