Merge pull request #232 from mcguirepr89/revert-229-fix/midnightbug
Revert "Fix/midnightbug"
This commit is contained in:
@@ -26,6 +26,14 @@ for h in "${SCAN_DIRS[@]}";do
|
|||||||
# Field 4: Common name
|
# Field 4: Common name
|
||||||
# Field 5: Confidence
|
# Field 5: Confidence
|
||||||
|
|
||||||
|
# Removes old directories
|
||||||
|
#if echo "${h}" | grep $(date --date="yesterday" "+%A") &> /dev/null;then
|
||||||
|
# echo "Removing old directories"
|
||||||
|
# rm -drf "${h}"
|
||||||
|
# rm -drf "$(echo ${h} | cut -d'-' -f1-3)"
|
||||||
|
# continue
|
||||||
|
#fi
|
||||||
|
|
||||||
# Iterates over each "Analyzed" directory
|
# Iterates over each "Analyzed" directory
|
||||||
for i in $(find ${h} -name '*csv' 2>/dev/null | sort );do
|
for i in $(find ${h} -name '*csv' 2>/dev/null | sort );do
|
||||||
# Iterates over each '.csv' file found in each "Analyzed" directory
|
# Iterates over each '.csv' file found in each "Analyzed" directory
|
||||||
@@ -134,14 +142,7 @@ for h in "${SCAN_DIRS[@]}";do
|
|||||||
# next extraction.
|
# next extraction.
|
||||||
[[ -d "${PROCESSED}" ]] || mkdir "${PROCESSED}"
|
[[ -d "${PROCESSED}" ]] || mkdir "${PROCESSED}"
|
||||||
#echo "Moving processed files to ${PROCESSED}"
|
#echo "Moving processed files to ${PROCESSED}"
|
||||||
mv ${h}/* ${PROCESSED} &> /dev/null || true
|
mv ${h}/* ${PROCESSED} &> /dev/null || continue
|
||||||
|
|
||||||
# Removes old directories
|
|
||||||
if echo "${h}" | grep $(date --date="-2 day" "+%A") &> /dev/null;then
|
|
||||||
echo "Removing old directories"
|
|
||||||
rm -drf "${h}"
|
|
||||||
rm -drf "$(echo ${h} | cut -d'-' -f1-3)"
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
|
|
||||||
#echo "Linking Processed files to "${EXTRACTED}/Processed" web directory"
|
#echo "Linking Processed files to "${EXTRACTED}/Processed" web directory"
|
||||||
|
|||||||
Reference in New Issue
Block a user