diff --git a/check_packages2install b/check_packages2install index 5ac996561bb2f5f6a02936298c59bdc836973aed..116ed2ec06359b7032dcfcf52bd42cee31d01895 100755 --- a/check_packages2install +++ b/check_packages2install @@ -148,7 +148,8 @@ function _detectPkgManager(){ # ---------------------------------------------------------------------- # show grouped packages by category -# OOPS: uses global vars :-/ +# global string dir_filter directory where to find filters +# global string packagemanOut output of update lister command function showFilteredPackages(){ # filtered package view @@ -159,8 +160,7 @@ function showFilteredPackages(){ filterAll="" # show filtered view - local _selfdir=$( dirname "$0" ) - for filterfile in $( find $dir_filter -name "*txt" | sort ) + for filterfile in $( find "$dir_filter" -name "*txt" | sort ) do # get group name from filename filtername=$( echo "$filterfile" | rev | cut -f 1 -d "/" | rev | sed "s#.txt\$##g" | sed "s#^[0-9]*_##g" ) @@ -221,6 +221,7 @@ if [ -z "$pkgmanager" ]; then ph.abort "UNKNOWN: the package manager was not detected/ is not supported." fi +# load functions for the detected package manager . "${dir_pkg}/${pkgmanager}.sh" || exit 2 packagemanOut=$( ${pkgmanager}GetUpdates ) diff --git a/check_packages2install-pkgmanager/pamac.sh b/check_packages2install-pkgmanager/pamac.sh index 2dfe81d9f74c16c99c8ee9b8ef7b63d6c02081c9..279b07308218f5e6c2f78002a3351ed9e87d4206 100644 --- a/check_packages2install-pkgmanager/pamac.sh +++ b/check_packages2install-pkgmanager/pamac.sh @@ -19,6 +19,7 @@ function pamacGetUpdates(){ # --------------------------------------------------------------- # extract list of packages 2 install +# global string packagemanOut output of update lister command function pamacPackages(){ echo "$packagemanOut" | grep -- '->' } diff --git a/check_packages2install-pkgmanager/yum.sh b/check_packages2install-pkgmanager/yum.sh index faeb94c2fa98d0ce313a831da033c02a62631bd9..6e557c647af38016ee029ff71affbe97373e72dc 100644 --- a/check_packages2install-pkgmanager/yum.sh +++ b/check_packages2install-pkgmanager/yum.sh @@ -41,7 +41,7 @@ function yumStatus(){ } # --------------------------------------------------------------- -# extract count of critical +# extract count of critical packages # param string text to extract critical counter from function yumCritical(){ local summary="$1"