Tweak install script for buster, now using proper deb repo instead of local builds

This commit is contained in:
Alexandre Aubin 2020-02-08 02:28:58 +01:00
parent 3e16abd7c4
commit ca17cf4a5d
2 changed files with 10 additions and 9 deletions

View file

@ -4,13 +4,13 @@
The script `install_yunohost` will install [YunoHost](https://yunohost.org/) on a Debian system. The script `install_yunohost` will install [YunoHost](https://yunohost.org/) on a Debian system.
Only Debian 9/Stretch systems running with kernel >= 3.12 [systemd](https://wiki.debian.org/systemd) - which is generally the default - are supported. Only Debian 10/Buster systems running with kernel >= 3.12 [systemd](https://wiki.debian.org/systemd) - which is generally the default - are supported.
## Basic usage ## Basic usage
With a `curl|bash` syntax : With a `curl|bash` syntax :
$ curl https://raw.githubusercontent.com/YunoHost/install_script/stretch/install_yunohost | bash $ curl https://raw.githubusercontent.com/YunoHost/install_script/buster/install_yunohost | bash
If something goes wrong, you can check the installation logs saved in ```/var/log/yunohost-installation.log``` If something goes wrong, you can check the installation logs saved in ```/var/log/yunohost-installation.log```

View file

@ -56,7 +56,7 @@ Options :
function parse_options() function parse_options()
{ {
AUTOMODE=0 AUTOMODE=0
DISTRIB=stable DISTRIB=unstable # FIXME : change this to testing / stable once we move to beta / stable releases...
BUILD_IMAGE=0 BUILD_IMAGE=0
FORCE=0 FORCE=0
@ -212,19 +212,19 @@ function check_assertions()
# Assert we're on Debian # Assert we're on Debian
# Note : we do not rely on lsb_release to avoid installing a dependency # Note : we do not rely on lsb_release to avoid installing a dependency
# only to check this... # only to check this...
[[ -f "/etc/debian_version" ]] || die "This script can only be ran on Debian 9 (Stretch)." [[ -f "/etc/debian_version" ]] || die "This script can only be ran on Debian 10 (Buster)."
# Assert we're on Stretch # Assert we're on Buster
# Note : we do not rely on lsb_release to avoid installing a dependency # Note : we do not rely on lsb_release to avoid installing a dependency
# only to check this... # only to check this...
[[ "$(cat /etc/debian_version)" =~ ^9.* ]] || die "YunoHost is only available for the version 9 (Stretch) of Debian, you are using '$(cat /etc/debian_version)'." [[ "$(cat /etc/debian_version)" =~ ^10.* ]] || die "YunoHost is only available for the version 10 (Buster) of Debian, you are using '$(cat /etc/debian_version)'."
# Forbid people from installing on Ubuntu or Linux mint ... # Forbid people from installing on Ubuntu or Linux mint ...
if [[ -f "/etc/lsb-release" ]]; if [[ -f "/etc/lsb-release" ]];
then then
if cat /etc/lsb-release | grep -q -i "Ubuntu\|Mint" if cat /etc/lsb-release | grep -q -i "Ubuntu\|Mint"
then then
die "Please don't try to install YunoHost on an Ubuntu or Linux Mint system ... You need a 'raw' Debian 9 (Stretch)." die "Please don't try to install YunoHost on an Ubuntu or Linux Mint system ... You need a 'raw' Debian 10 (Buster)."
fi fi
fi fi
@ -392,7 +392,7 @@ function setup_package_source() {
# Debian repository # Debian repository
local CUSTOMDEB="deb http://forge.yunohost.org/debian/ stretch stable" local CUSTOMDEB="deb http://forge.yunohost.org/debian/ buster stable"
if [[ "$DISTRIB" == "stable" ]] ; then if [[ "$DISTRIB" == "stable" ]] ; then
echo "$CUSTOMDEB" > $CUSTOMAPT echo "$CUSTOMDEB" > $CUSTOMAPT
@ -507,8 +507,9 @@ function install_yunohost_packages() {
-o Dpkg::Options::="--force-confold" \ -o Dpkg::Options::="--force-confold" \
-o APT::install-recommends=true \ -o APT::install-recommends=true \
-y install \ -y install \
yunohost yunohost-admin postfix \ yunohost postfix \
|| return 1 || return 1
#yunohost yunohost-admin postfix \ # FIXME / TODO : temporarily removed yunohost-admin because build on vinaigrette is broken, to be re-added once it's fixed
} }
function restart_services() { function restart_services() {