Merge branch 'find' into 'master'

Fix find commands

See merge request !22

stream8_snapshots/regen-repos.sh

@@ -4,7 +4,6 @@ source /root/common.sh
 
 REPO_REGEX="$1"
 TAG_REGEX="$2"
-#REGEX="c${RELEASE}-.*"
 REGEN_JOB="prod_koji-regenrepo"
 
 PAYLOAD="{"

stream8_snapshots/sendemail.sh

@@ -22,7 +22,7 @@ for ARCH in $CENTOS_ARCHES; do
   for REPO in $ALL_REPOS; do
     CLEANREPO="${REPO/\//-}"
     if [[ $CHANNEL == "daily" ]]; then
-      SEARCH="-name .diff -path */$REPO/$ARCH/*"
+      SEARCH="-path */$REPO/$ARCH/* -name .diff"
     elif [[ $CHANNEL == "testing" ]]; then
       SEARCH="-name .diff:*-$LN_TESTING:$CLEANREPO:$ARCH"
     else

stream8_snapshots/tripwire.sh

@@ -6,7 +6,7 @@ echo "Checking for dangerous packages..."
 
 TMPDIR=`mktemp -d`
 
-find "$DEST" -name .diff -not -path '*/CERN/*' -not -path '*/Source/*' -not -path '*/Debug/*' -exec cat {} \; | sort -u  > $TMPDIR/alldiffs
+find "$DEST" -not -path '*/CERN/*' -not -path '*/Source/*' -not -path '*/Debug/*' -name .diff -exec cat {} \; | sort -u  > $TMPDIR/alldiffs
 
 while IFS= read -r LINE; do
   while IFS= read -r RPM; do
@@ -20,7 +20,7 @@ while IFS= read -r LINE; do
 
     for ARCH in $ARCHES; do
       # Assemble all the repos into a list of --repofrompath parameters for repoquery
-      repos="`find "$DEST" -path "*/${ARCH}/*" -name 'repodata' -not -path '*/Source/*' -not -path '*/Debug/*' | sed 's#/repodata##' | awk '{printf " --repofrompath=r" NR "," $0}'`"
+      repos="`find "$DEST" -path "*/${ARCH}/*" -not -path '*/Source/*' -not -path '*/Debug/*' -name 'repodata' | sed 's#/repodata##' | awk '{printf " --repofrompath=r" NR "," $0}'`"
 
       latest_all=`repoquery --disablerepo='*' $repos --latest-limit 1 $N 2>/dev/null`
       latest_cern=`repoquery --disablerepo='*' --repofrompath=r17,${DEST}/CERN/${ARCH}/ --latest-limit 1 $N 2>/dev/null`