Skip to content

Commit

Permalink
Use new read_packages_file function
Browse files Browse the repository at this point in the history
  • Loading branch information
Botspot committed Feb 24, 2024
1 parent 7c6cf2f commit ba46ca1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gui
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
5 changes: 3 additions & 2 deletions manage
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ba46ca1

Please sign in to comment.