diff options
| -rwxr-xr-x | metadata/scripts/update-cron.sh | 8 | ||||
| -rwxr-xr-x | scripts/do-update.sh | 10 |
2 files changed, 4 insertions, 14 deletions
diff --git a/metadata/scripts/update-cron.sh b/metadata/scripts/update-cron.sh index f00daa03..8f9ed813 100755 --- a/metadata/scripts/update-cron.sh +++ b/metadata/scripts/update-cron.sh @@ -2,9 +2,9 @@ update() { - echo "git pull" - git pull || return $? - echo + #echo "git pull" + #git pull || return $? + #echo echo "make aggregate" make aggregate || return $? @@ -23,5 +23,5 @@ update() #echo } -cd /opt/swamid-metadata || exit 1 +cd /opt/metadata || exit 1 update diff --git a/scripts/do-update.sh b/scripts/do-update.sh index 5dc38700..6b29a34f 100755 --- a/scripts/do-update.sh +++ b/scripts/do-update.sh @@ -1,13 +1,3 @@ #!/bin/bash cd /var/cache/metadata_git.swamid.se && make update -rsync -a /opt/metadata/swamid-internal/* /opt/metadata/swamid-qa - -./scripts/download-pending -cd /var/cache/metadata_git.swamid.se/metadata || exit 2 -for file in `ls swamid-internal/` ; do - if [ -r swamid-qa/$file ]; then - diff swamid-internal/$file swamid-qa/$file || exit 1 - fi -done -#/opt/metadata/scripts/update-and-validate.sh |