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

Merge pull request #57 from YunoHost/enh-remove-obsolete-force-yes

Browse source 
[enh] Avoid obsolete warning about force-yes
This commit is contained in:
Bram 2019-09-11 00:03:00 +02:00 • committed by GitHub
commit 00a4cba1dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
install_yunohost
View file

@ -263,7 +263,7 @@ function upgrade_system() {
# perl is yolomacnuggets :| # perl is yolomacnuggets :|
# Stuff like "Can't locate object method "new" via package "Text::Iconv"" # Stuff like "Can't locate object method "new" via package "Text::Iconv""
apt_get_wrapper -o Dpkg::Options::="--force-confold" \ apt_get_wrapper -o Dpkg::Options::="--force-confold" \
-y --force-yes install \ -y install \
libtext-iconv-perl \ libtext-iconv-perl \
|| return 1 || return 1
@ -282,7 +282,7 @@ function upgrade_system() {
if is_raspbian ; then if is_raspbian ; then
apt_get_wrapper -o Dpkg::Options::="--force-confold" \ apt_get_wrapper -o Dpkg::Options::="--force-confold" \
-y --force-yes install rpi-update \ -y install rpi-update \
|| return 3 || return 3
if [[ "$BUILD_IMAGE" != "1" ]] ; then if [[ "$BUILD_IMAGE" != "1" ]] ; then
@ -303,7 +303,7 @@ function install_script_dependencies() {
apt_update apt_update
apt_get_wrapper -o Dpkg::Options::="--force-confold" \ apt_get_wrapper -o Dpkg::Options::="--force-confold" \
-y --force-yes install \ -y install \
$DEPENDENCIES \ $DEPENDENCIES \
|| return 1 || return 1
} }
@ -495,7 +495,7 @@ function install_yunohost_packages() {
# c.f. https://github.com/YunoHost/issues/issues/1382 # c.f. https://github.com/YunoHost/issues/issues/1382
apt_get_wrapper \ apt_get_wrapper \
-o Dpkg::Options::="--force-confold" \ -o Dpkg::Options::="--force-confold" \
-y --force-yes install \ -y install \
debhelper dh-autoreconf \ debhelper dh-autoreconf \
|| true || true
@ -503,7 +503,7 @@ function install_yunohost_packages() {
apt_get_wrapper \ apt_get_wrapper \
-o Dpkg::Options::="--force-confold" \ -o Dpkg::Options::="--force-confold" \
-o APT::install-recommends=true \ -o APT::install-recommends=true \
-y --force-yes install \ -y install \
yunohost yunohost-admin postfix \ yunohost yunohost-admin postfix \
|| return 1 || return 1
} }