From ba46ca1981ce09690dd4af35348f7943463097a9 Mon Sep 17 00:00:00 2001
From: Botspot <54716352+Botspot@users.noreply.github.com>
Date: Sat, 24 Feb 2024 02:01:46 -0600
Subject: [PATCH] Use new read_packages_file function

---
 gui    | 2 +-
 manage | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gui b/gui
index a53a88e81d..58d84fa418 100755
--- a/gui
+++ b/gui
@@ -324,7 +324,7 @@ details_window() { #input: prefix/app
   
   #If package-app, show what packages it installs
   if [ -f "${DIRECTORY}/apps/${app}/packages" ];then
-    local packages="$(cat "${DIRECTORY}/apps/${app}/packages")"
+    local packages="$(read_packages_file "$app")"
     if [ "$(wc -w <<<"$packages")" == 1 ];then
       #if package-app uses only 1 package, use singular case
       abovetext+=$'\n'"- This app installs the <b>${packages}</b> package."
diff --git a/manage b/manage
index b616134f2f..f8b45f9863 100755
--- a/manage
+++ b/manage
@@ -663,8 +663,9 @@ elif [ "$1" == 'install' ] || [ "$1" == 'uninstall' ];then
     appscript=("${DIRECTORY}/apps/${app}/${scriptname}")
     chmod u+x "$appscript" &>/dev/null
   #if this app just lists a package-name, set the appscript to install that package
-  else
-    appscript=(bash -c -o pipefail "apt_lock_wait ; sudo -E apt $(echo "$action" | sed 's/uninstall/purge --autoremove/g') -yf $(cat "${DIRECTORY}/apps/$app/packages") 2>&1 | less_apt")
+  
+  else #package-app: directly use apt to install what is mentioned in the packages file
+    appscript=(bash -c -o pipefail "apt_lock_wait ; sudo -E apt $(echo "$action" | sed 's/uninstall/purge --autoremove/g') -yf $(read_packages_file "$app") 2>&1 | less_apt")
   fi
   
   #print to terminal