yum-arch is not supported on recent fedoras

diff --git a/plc.d/packages b/plc.d/packages
index c8df19a..69564d5 100755 (executable)
--- a/plc.d/packages
+++ b/plc.d/packages
@@ -44,9 +44,9 @@ case "$1" in
            createrepo=0
 
            # Create a stamp once the package gets signed
            createrepo=0
 
            # Create a stamp once the package gets signed

-           mkdir $repository/signed-stamps
+           mkdir $repository/signed-stamps 2> /dev/null

 
 

-           for package in $repository/*/*.rpm ; do
+           for package in $(find $repository/ -name '*.rpm') ; do

                stamp=$repository/signed-stamps/$(basename $package).signed
                # If package is newer than signature stamp
                if [ $package -nt $stamp ] ; then
                stamp=$repository/signed-stamps/$(basename $package).signed
                # If package is newer than signature stamp
                if [ $package -nt $stamp ] ; then


@@ -79,18 +79,22 @@ case "$1" in
            # .oldheaders and .olddata directories accidentally.
            rm -rf $repository/{.oldheaders,.olddata}
 
            # .oldheaders and .olddata directories accidentally.
            rm -rf $repository/{.oldheaders,.olddata}
 

+           type -p yum-arch > /dev/null && have_yum_arch="true"
+

            # Old command is yum-arch
            # Old command is yum-arch

-           if [ $yum_arch -eq 1 ] ; then
-               yum-arch $repository | tr '\r' '\n' | grep -v '^ *$'
+           if [ -n "$have_yum_arch" -a $yum_arch -eq 1 ] ; then
+               yum-arch $repository 

                check
            fi
 
                check
            fi
 

+           type -p createrepo > /dev/null && have_createrepo="true"
+

            # New command is createrepo
            # New command is createrepo

-           if [ $createrepo -eq 1 ] ; then
+           if [ -n "$have_createrepo" -a $createrepo -eq 1 ] ; then

                if [ -f $repository/yumgroups.xml ] ; then
                if [ -f $repository/yumgroups.xml ] ; then

-                   createrepo -g yumgroups.xml $repository | tr '\r' '\n' | grep -v '^ *$'
+                   createrepo --quiet -g yumgroups.xml $repository 

                else
                else

-                   createrepo $repository | tr '\r' '\n' | grep -v '^ *$'
+                   createrepo --quiet $repository

                fi
                check
            fi
                fi
                check
            fi