From 8ce437828e1753edfb50d7f22378755e39b393f1 Mon Sep 17 00:00:00 2001
From: jo <ljonas@riseup.net>
Date: Mon, 16 Aug 2021 23:49:15 +0200
Subject: [PATCH] Remove install apt-get dangerous options

Apt should fail fast (and report) instead of
forcing a broken installation.

The version check is also not required anymore as
most distribution now provide an apt version > 1.1.
---
 install                     | 18 +++++-------------
 installer/vagrant/debian.sh |  2 +-
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/install b/install
index 6c2c1aa47..56f13f875 100755
--- a/install
+++ b/install
@@ -714,23 +714,15 @@ if [ "$ignore_dependencies" = "f" ]; then
         verbose "\n * Reading requirements-${dist}-${code}.apt..."
         loudCmd "apt-get -q update"
         package_list_file="${SCRIPT_DIR}/installer/apt/requirements-${dist}-${code}.apt"
+
         if [ ! -f "$package_list_file" ]; then
             echo "ERROR: package file does not exist: $package_list_file" >&2
             exit 1
         fi
-        # For apt-get version 1.1 or higher, --force-yes is deprecated so use new options.
-        apt_force_options="--allow-downgrades --allow-remove-essential --allow-change-held-packages"
-        # Get apt-get version by returning the 2nd parameter from the 1st line of output
-        apt_version=$(apt-get --version |awk 'NR == 1 { print $2 }')
-        # returns 1.8.0~alpha3 (Debian Buster)
-        verbose "Detected apt-get version as: $apt_version"
-        apt_version_formatted=$(awk 'BEGIN {FS = "."} {printf "%03d.%03d\n", $1,$2}' <<<  $apt_version)
-        [[ "$apt_version_formatted" < "001.001" ]] && apt_force_options="--force-yes"
-        verbose "Using apt-get force options: $apt_force_options"
-        loudCmd "DEBIAN_FRONTEND=noninteractive apt-get -y -m ${apt_force_options} install $(grep -vE '^\s*#' $package_list_file | tr '\n' ' ')"
-        if [ "$in_place" = "t" ]; then
-            loudCmd "DEBIAN_FRONTEND=noninteractive apt-get -y -m install git"
-        fi
+
+        package_list="$(grep -vE '^\s*#' "$package_list_file" | tr '\n' ' ')"
+        loudCmd "DEBIAN_FRONTEND=noninteractive apt-get -y install $package_list"
+        [[ "$in_place" == "t" ]] && loudCmd "DEBIAN_FRONTEND=noninteractive apt-get -y install git"
     else
         echo "WARNING: installing dependencies is not supported for this distribution" >&2
     fi
diff --git a/installer/vagrant/debian.sh b/installer/vagrant/debian.sh
index 8789ed8d0..c08d0aad7 100755
--- a/installer/vagrant/debian.sh
+++ b/installer/vagrant/debian.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-DEBIAN_FRONTEND=noninteractive apt-get -y -m --force-yes install alsa-utils
+DEBIAN_FRONTEND=noninteractive apt-get -y install alsa-utils
 usermod -a -G audio vagrant
 usermod -a -G audio www-data