From 0b622c01dd87d125b33eaf7f32c239a63f5e1d6b Mon Sep 17 00:00:00 2001
From: Botspot <j.allen.marchand@outlook.com>
Date: Tue, 31 Aug 2021 22:37:51 -0500
Subject: [PATCH] api: use faster apt_lock_wait

---
 api | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/api b/api
index 3554a12..3324849 100755
--- a/api
+++ b/api
@@ -375,20 +375,26 @@ runonce() { #run command only if it's never been run before. Useful for one-time
 
 apt_lock_wait() { #Wait until other apt processes are finished before proceeding
   echo -n "Waiting until APT locks are released... "
-  while sudo fuser /var/lib/dpkg/lock &>/dev/null ; do
-    sleep 0.5
+  #while sudo fuser /var/lib/dpkg/lock &>/dev/null ; do
+  #  sleep 0.5
+  #done
+  #while sudo fuser /var/lib/dpkg/lock-frontend &>/dev/null ; do
+  #  sleep 0.5
+  #done
+  #while sudo fuser /var/lib/apt/lists/lock &>/dev/null ; do
+  #  sleep 0.5
+  #done
+  #if [ -f /var/log/unattended-upgrades/unattended-upgrades.log ]; then
+  #  while sudo fuser /var/log/unattended-upgrades/unattended-upgrades.log &>/dev/null ; do
+  #    sleep 0.5
+  #  done
+  #fi
+  
+  while sudo fuser /var/{lib/{dpkg,apt/lists},cache/apt/archives}/lock /var/log/unattended-upgrades/unattended-upgrades.log &>/dev/null ;do
+    sleep 1
   done
-  while sudo fuser /var/lib/dpkg/lock-frontend &>/dev/null ; do
-    sleep 0.5
-  done
-  while sudo fuser /var/lib/apt/lists/lock &>/dev/null ; do
-    sleep 0.5
-  done
-  if [ -f /var/log/unattended-upgrades/unattended-upgrades.log ]; then
-    while sudo fuser /var/log/unattended-upgrades/unattended-upgrades.log &>/dev/null ; do
-      sleep 0.5
-    done
-  fi
+  sleep 0.5
+  
   echo "Done"
 }