fix apt stuck in interactive conf file dialog

Signed-off-by: nachoparker <[email protected]>
nextcloud · Sep 28, 2019 · 46b2187 · 46b2187
1 parent f885861
commit 46b2187
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,7 +1,9 @@
 
-[v1.16.8](https://github.com/nextcloud/nextcloudpi/commit/c35c752) (2019-09-16) unattended-upgrades: fix armbian disabling UU
+[v1.16.9](https://github.com/nextcloud/nextcloudpi/commit/c855204) (2019-09-28) fix apt stuck in interactive conf file dialog
 
-[v1.16.7](https://github.com/nextcloud/nextcloudpi/commit/9ee9947) (2019-09-11) Increased modsecurity bodynofileslimit so larger files can be synced (#993)
+[v1.16.8](https://github.com/nextcloud/nextcloudpi/commit/f885861) (2019-09-16) unattended-upgrades: fix armbian disabling UU
+
+[v1.16.7 ](https://github.com/nextcloud/nextcloudpi/commit/9ee9947) (2019-09-11) Increased modsecurity bodynofileslimit so larger files can be synced (#993)
 
 [v1.16.6](https://github.com/nextcloud/nextcloudpi/commit/dbf129f) (2019-09-13) nc-datadir: fix
 

diff --git a/etc/library.sh b/etc/library.sh
@@ -278,6 +278,12 @@ function check_distro()
   return 1
 }
 
+function apt_install()
+{
+  apt-get update
+  apt-get install -y --no-install-recommends -o Dpkg::Options::=--force-confdef
+}
+
 # License
 #
 # This script is free software; you can redistribute it and/or modify it

diff --git a/updates/1.13.6.sh b/updates/1.13.6.sh
@@ -83,7 +83,7 @@ EOF
 
   # update launchers
   apt-get update
-  apt-get install -y --no-install-recommends file
+  apt_install file
   cat > /home/www/ncp-launcher.sh <<'EOF'
 #!/bin/bash
 grep -q '[\\&#;`|*?~<>^()[{}$&[:space:]]' <<< "$*" && exit 1

diff --git a/updates/1.16.0.sh b/updates/1.16.0.sh
@@ -9,11 +9,10 @@ source /usr/local/etc/library.sh
 # all images
 
 # restore smbclient after dist upgrade
-apt-get update
-apt-get install -y --no-install-recommends php-smbclient exfat-fuse exfat-utils
+apt_install php-smbclient exfat-fuse exfat-utils
 
 # install lsb-release
-apt-get install -y --no-install-recommends lsb-release
+apt_install lsb-release
 
 # tweak previews
 ncc config:app:set preview jpeg_quality --value="60"
@@ -37,7 +36,7 @@ sed -i "s/stretch/$RELEASE/g" /etc/apt/sources.list.d/* &>/dev/null || true
   # https://github.com/nextcloud/nextcloudpi/issues/938
   test -f /usr/bin/raspi-config && {
     apt-get update
-    apt-get install -y --no-install-recommends haveged
+    apt_install haveged
     systemctl enable haveged.service
   }
 

diff --git a/updates/1.17.0.sh b/updates/1.17.0.sh
@@ -12,8 +12,7 @@ source /usr/local/etc/library.sh # sets NCVER PHPVER RELEASE
 sed -i "s/buster/$RELEASE/g" /etc/apt/sources.list.d/* &>/dev/null || true
 
 # restore smbclient after dist upgrade
-apt-get update
-apt-get install -y --no-install-recommends php${PHPVER}-gmp
+apt_install php${PHPVER}-gmp
 
 # Update modsecurity config file only if user is already in buster and
 # modsecurity is used.