Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › f268a69
Add $PREFIX to pkg command
Alex Kozlov committed 13 years ago
commit f268a69a06d38908527164613b990aca25c8de15
parent a9fc4e0
5 files changed +15 -7
modified scripts/periodic/400.status-pkg
@@ -10,10 +10,12 @@ fi


case "$weekly_status_pkg_enable" in

    [Yy][Ee][Ss])
+ 
	pkgcmd=/usr/local/sbin/pkg
+ 


	echo ''

	echo 'Checking for out of date packages:'
- 
	rc=$(pkg version -v ${pkg_version_index} |
+ 
	rc=$(${pkgcmd} version -v ${pkg_version_index} |

	    sed -n -e '/up-to-date/d' \

	    -e 's/^\([^[:space:]]*\)[[:space:]]*[<>=!?][[:space:]]*\(.*\)$/\1 \2/p' |

	    tee /dev/stderr |
modified scripts/periodic/410.pkg-audit
@@ -51,6 +51,8 @@ case "${daily_status_security_pkgaudit_enable:-YES}" in
	[Nn][Oo])

		;;

	*)
+ 
		pkgcmd=/usr/local/sbin/pkg
+ 


		echo

                echo "Checking for packages with security vulnerabilities:"

		then=`stat -f '%m' "${auditfile}" 2> /dev/null` || rc=3
@@ -59,13 +61,13 @@ case "${daily_status_security_pkgaudit_enable:-YES}" in
		if [ $rc -ne 0 -o \

			$(( 86400 \* "${daily_status_security_pkgaudit_expiry:-2}" )) \

			-le $(( ${now} - ${then} + 600 )) ]; then
- 
			/usr/local/sbin/pkg audit -Fq || {
+ 
			${pkgcmd} audit -Fq || {

			  rc=$?; [ $rc -lt 3 ] && rc=3

			}

		else

			echo -n "Database fetched: ";

			date -r "${then}" || rc=3
- 
			/usr/local/sbin/pkg audit || {
+ 
			${pkgcmd} audit || {

			  rc=$?; [ $rc -lt 3 ] && rc=3

			}

		fi
modified scripts/periodic/411.pkg-backup
@@ -19,7 +19,7 @@ case "${daily_backup_pkgng_enable:-YES}" in
    *)

	bak="${daily_backup_pkgng_dir:-/var/backups}"

	bak_file="${bak}/pkgng.db"
- 
	pkgcmd="/usr/local/sbin/pkg"
+ 
	pkgcmd=/usr/local/sbin/pkg



	if [ ! -d "$bak" ]

	then
modified scripts/periodic/460.chkpkgsum
@@ -12,9 +12,11 @@ fi


case "${daily_status_security_chkpkgsum_enable}" in

    [Yy][Ee][Ss])
+ 
	pkgcmd=/usr/local/sbin/pkg
+ 


	echo ''

	echo 'Checking for packages with mismatched checksums:'
- 
	n=$(pkg check -sa 2>&1 |
+ 
	n=$(${pkgcmd} check -sa 2>&1 |

	sed -e 's/ checksum mismatch for//' |

	tee /dev/stderr | wc -l)

	[ $n -gt 0 ] && rc=1 || rc=0
modified scripts/periodic/490.status-pkg-changes
@@ -10,9 +10,11 @@ fi


case "$daily_status_pkg_changes_enable" in

    [Yy][Ee][Ss])
+ 
	pkgcmd=/usr/local/sbin/pkg
+ 


	echo ''

	echo 'Changes in installed packages:'
- 
	if pkg -N >/dev/null 2>&1 ; then
+ 
	if ${pkgcmd} -N >/dev/null 2>&1 ; then

	    echo 'status-pkg-changes is enabled but pkg is not used'

	    rc=2

	else
@@ -20,7 +22,7 @@ case "$daily_status_pkg_changes_enable" in
	    rc=0



	    [ -r $bak/pkg.bak ] && mv -f $bak/pkg.bak $bak/pkg.bak2
- 
	    pkg info > $bak/pkg.bak
+ 
	    ${pkgcmd} info > $bak/pkg.bak



	    cmp -sz $bak/pkg.bak $bak/pkg.bak2

	    if [ $? -eq 1 ]; then