From 95023569803115e9cf913c0878b018f91c0a7429 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Fri, 3 Mar 2017 11:52:49 +0100
Subject: [PATCH] Move test_dpkg_lock to initial UPDATE_PKG_CACHE. There was
 unpredictable interference with debconf-apt-progress

---
 automated install/basic-install.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 19e23c16..57c49233 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -59,8 +59,8 @@ distro_check() {
 if command -v apt-get &> /dev/null; then
   #Debian Family
   #############################################
-  PKG_MANAGER="test_dpkg_lock; apt-get"
-  UPDATE_PKG_CACHE="${PKG_MANAGER} update"
+  PKG_MANAGER="apt-get"
+  UPDATE_PKG_CACHE="test_dpkg_lock; ${PKG_MANAGER} update"
   PKG_INSTALL=(${PKG_MANAGER} --yes --no-install-recommends install)
   # grep -c will return 1 retVal on 0 matches, block this throwing the set -e with an OR TRUE
   PKG_COUNT="${PKG_MANAGER} -s -o Debug::NoLocking=true upgrade | grep -c ^Inst || true"
@@ -799,6 +799,7 @@ install_dependent_packages() {
       fi
     done
     if [[ ${#installArray[@]} -gt 0 ]]; then
+      test_dpkg_lock
       debconf-apt-progress -- "${PKG_INSTALL[@]}" "${installArray[@]}"
       return
     fi