From af7d21a99e1b04ed683715ef27005e0dcd0eec92 Mon Sep 17 00:00:00 2001 From: Dave Woodfall Date: Mon, 5 Apr 2021 05:17:43 +0000 Subject: Remove now pointless if/then/else --- files/core-functions.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/files/core-functions.sh b/files/core-functions.sh index 1f4faf3..2e89f45 100644 --- a/files/core-functions.sh +++ b/files/core-functions.sh @@ -631,13 +631,9 @@ function makelist() { INPUTLIST=$@ - if echo $CMD | grep -q install ; then - ls -1 $ROOT/var/log/packages/* | - awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist - else - ls -1 $ROOT/var/log/packages/* | - awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist - fi + printf "%s\n" $ROOT/var/log/packages/* | + awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist + cat ${WORKDIR}/pkglist > ${TMPDIR}/pkglist touch ${TMPDIR}/waiting -- cgit v1.2.3