[PATCH 10/10] policycoreutils: fixfiles: use a consistent order for options to restorecon

[Alan Jenkins]

It helps see the differences (hopefully there are only intended differences
now!).
---
 policycoreutils/scripts/fixfiles | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/policycoreutils/scripts/fixfiles b/policycoreutils/scripts/fixfiles
index cff1111..0eeeea4 100755
--- a/policycoreutils/scripts/fixfiles
+++ b/policycoreutils/scripts/fixfiles
@@ -195,7 +195,7 @@ if [ -f ${PREFC} -a -x /usr/bin/diff ]; then
                  esac; \
               fi; \
            done | \
-       ${RESTORECON} ${VERBOSE} -i -f - -R $* ${EXCLUDEDIRS} ${FORCEFLAG}; \
+       ${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} $* -i -R -f -; \
        rm -f ${TEMPFILE} ${PREFCTEMPFILE}
 fi
 }
@@ -232,17 +232,17 @@ LogExcluded
 case "$RESTORE_MODE" in
     RPMFILES)
        for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do
-           rpmlist $i | ${RESTORECON} ${EXCLUDEDIRS} ${FORCEFLAG} ${VERBOSE} 
$* -R -i -f -
+           rpmlist $i | ${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} 
$* -i -R -f -
        done
     ;;
     FILEPATH)
-       ${RESTORECON} ${EXCLUDEDIRS} ${FORCEFLAG} ${VERBOSE} -R $* -- 
"$FILEPATH"
+       ${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} $* -R -- 
"$FILEPATH"
     ;;
     DEFAULT)
        if [ -n "${FILESYSTEMSRW}" ]; then
            LogReadOnly
            echo "${OPTION}ing `echo ${FILESYSTEMSRW}`"
-           ${SETFILES} ${VERBOSE} ${EXCLUDEDIRS} -q ${FORCEFLAG} $* ${FC} 
${FILESYSTEMSRW}
+           ${SETFILES} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} $* -q ${FC} 
${FILESYSTEMSRW}
        else
            echo >&2 "fixfiles: No suitable file systems found"
        fi
-- 
2.9.3