From 02007bac5da4483bb66e2ceaa1d1b9e75b9bb388 Mon Sep 17 00:00:00 2001 From: jackofspades707 Date: Sat, 20 Jan 2018 21:31:19 -0800 Subject: [PATCH] [!] pkgbuild.sh.in --- src/lib/pkgbuild.sh.in | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/lib/pkgbuild.sh.in b/src/lib/pkgbuild.sh.in index c433759..a3d5ff2 100644 --- a/src/lib/pkgbuild.sh.in +++ b/src/lib/pkgbuild.sh.in @@ -321,13 +321,15 @@ install_package() { while true; do echo msg "$(_gettext "Continue installing %s ?" "$pkgbase") $(yes_no 1)" - prompt $(gettext '[v]iew package contents [c]heck package with namcap') - local answer=$(builduserinput "YNVC" "Y") + prompt $(gettext '[s]can with clamscan [v]iew package contents [c]heck package with namcap') # JACK CUSTOM EDIT HERE + local answer=$(builduserinput "YNVCS" "Y") # JACK CUSTOM EDIT HERE echo case "$answer" in V) local i=0 - for _file in "$YPKGDEST"/!(*.sig); do - (( i++ )) && { prompt2 $(gettext 'Press any key to continue'); read -n 1; } + echo "$YPKGDEST"/!(*.sig) + msg $(gettext "$YPKGDEST"/!(*.sig)) + for _file in "$YPKGDEST"/!(*.sig) + do (( i++ )) && { prompt2 $(gettext 'Press any key to continue'); read -n 1; } $PACMAN -Qlp "$_file" done ;; @@ -340,6 +342,14 @@ install_package() { fi echo ;; + # JACK CUSTOM EDITS START + S) + if command -v "clamscan" &> /dev/null 2>&1; then + clamscan -r -a -z --detect-broken --no-summary --stdout $($PACMAN -Qlp $(msg $(gettext $YPKGDEST/!(*.sig)))) + else warning $(gettext 'clamscan is missing from path, is clamav installed?') + fi + ;; + # JACK CUSTOM EDITS END Y) break;; *) failed=1; break;; esac