diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rename-xml.sh | 2 | ||||
| -rwxr-xr-x | scripts/update-and-validate.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/rename-xml.sh b/scripts/rename-xml.sh index 9ef89ead..e82742d9 100755 --- a/scripts/rename-xml.sh +++ b/scripts/rename-xml.sh @@ -32,7 +32,7 @@ if test -d swamid-2.0 ; then fi if echo "$entityID" | grep -qE '^http://|^https://' ; then - metadata=`grep -il "$entityID" *` + metadata=`grep -il "entityID.*$entityID" *` else echo "Missing http(s) in entityID" fi diff --git a/scripts/update-and-validate.sh b/scripts/update-and-validate.sh index 280064f9..c9a5c0f9 100755 --- a/scripts/update-and-validate.sh +++ b/scripts/update-and-validate.sh @@ -8,8 +8,6 @@ update() /var/www/scripts/updateWebb.bash - make -f Makefile.validate -s - ls swamid-2.0/*.xml | sed 's@swamid-2.0/\(.*\).xml@.time/\1.validate@' > /tmp/$$.xml ls .time/*.validate > /tmp/$$.time comm -13 /tmp/$$.xml /tmp/$$.time | while read file; do @@ -21,6 +19,8 @@ update() if [ $(find .time/ -ctime +15 | wc -l) -ne 0 ]; then rm `find .time/ -ctime +15 | tail -10` fi + + make -f Makefile.validate -s } cd /opt/swamid-metadata || exit 1 |