api: anything_installed_from_uri_suite_component simplify function

improve readibility, optimize list of installed packages

Co-Authored-By: Botspot <[email protected]>

api

@@ -225,51 +225,42 @@ anything_installed_from_repo() { #Given an apt repository URL, determine if any
 }
 
 anything_installed_from_uri_suite_component() { #Given an apt repository uri, suite, and component, determine if any packages from it are currently installed
-  [ -z "$1" ] && error "anything_installed_from_uri_suite_component: A repository uri must be specified."
-  [ -z "$2" ] && error "anything_installed_from_uri_suite_component: A repository suite must be specified."
-
-  #component is an optional specification
-  if [ -z "$3" ]; then
-    local filepath="/var/lib/apt/lists/$(echo "$1" | sed 's+.*://++g' | sed "s,/$,," | tr '/' '_')_$(echo "$2" | sed "s,/$,," | tr '/' '_')_"
+  local uri="$1"
+  local suite="$2"
+  component="$3" #can be left blank
+  [ -z "$uri" ] && error "anything_installed_from_uri_suite_component: A repository uri must be specified."
+  [ -z "$suite" ] && error "anything_installed_from_uri_suite_component: A repository suite must be specified."
+
+  #find part of path to apt list file(s) to search for
+  if [ -z "$component" ]; then
+    local filepath="/var/lib/apt/lists/$(echo "$1" | sed 's+.*://++g' | sed "s,/$,," | tr '/' '_')_$(echo "$suite" | sed "s,/$,," | tr '/' '_')_"
   else
-    local filepath="/var/lib/apt/lists/$(echo "$1" | sed 's+.*://++g' | sed "s,/$,," | tr '/' '_')_dists_$(echo "$2" | sed "s,/$,," | tr '/' '_')_$(echo "$3" | sed "s,/$,," | tr '/' '_')_"
+    local filepath="/var/lib/apt/lists/$(echo "$1" | sed 's+.*://++g' | sed "s,/$,," | tr '/' '_')_dists_$(echo "$suite" | sed "s,/$,," | tr '/' '_')_$(echo "$component" | sed "s,/$,," | tr '/' '_')_"
   fi
   debug $filepath
 
   #find all relevant package-lists
-  local repofiles="$(ls $filepath*Packages)"
+  local repofiles="$(ls ${filepath}*_Packages)"
   debug "$repofiles"
 
   #for every repo-file, check if any of them have an installed file
-  local found=0
   local IFS=$'\n'
   local repofile
+  local installed_packages="$(grep -xF 'Status: install ok installed' /var/lib/dpkg/status -B 2 | grep '^Package: ' | sed 's/^Package: //g' | sort)"
   for repofile in $repofiles ;do
     #search the repo-file for installed packages
-
-    local packages_in_repo="$(grep '^Package' "$repofile" | awk '{print $2}' | sort)"
-    local installed_packages="$(apt list --installed 2>/dev/null | tail -n +2 | awk -F/ '{print $1}')"
+
+    local packages_in_repo="$(grep '^Package: ' "$repofile" | awk '{print $2}' | sort)"
     local apt_cache_policy_output="$(echo "$packages_in_repo" | list_intersect "$installed_packages" | tr '\n' ' ' | xargs -r apt-cache policy)"
 
-    if [ -z "$3" ]; then
-      if echo "$apt_cache_policy_output" | grep -B1 "$(echo "$1" | sed 's+.*://++g' | sed "s,/$,,") $2" | awk '{print $1}' | grep -Fq '***' ;then
-        found=1
-        break
-      fi
+    #check if any installed packages also found on this repo are actually installed from this repo
+    if [ -z "$component" ]; then
+      echo "$apt_cache_policy_output" | grep -B1 "$(echo "$uri" | sed 's+.*://++g' | sed "s,/$,,") $suite" | awk '{print $1}' | grep -Fq '***' && return 0
     else
-      if echo "$apt_cache_policy_output" | grep -B1 "$(echo "$1" | sed 's+.*://++g' | sed "s,/$,,") $2/$3" | awk '{print $1}' | grep -Fq '***' ;then
-        found=1
-        break
-      fi
+      echo "$apt_cache_policy_output" | grep -B1 "$(echo "$uri" | sed 's+.*://++g' | sed "s,/$,,") $suite/$component" | awk '{print $1}' | grep -Fq '***' && return 0
     fi
   done
-
-  #return an exit code
-  if [ $found == 1 ];then
-    return 0
-  else
-    return 1
-  fi
+  return 1
 }
 
 remove_repofile_if_unused() { #Given a sources.list.d file, delete it if nothing from that repository is currently installed. Deletion skipped if $2 is 'test'