summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Wassberg <jocar@sunet.se>2023-03-17 13:24:44 +0100
committerJohan Wassberg <jocar@sunet.se>2023-03-17 13:24:44 +0100
commit411f3f9913524b67be7c5a4e4979a6be466e096e (patch)
treedb72a84f3ff30b022d12ce001dfa11cec22df06d
parentdffd738cd8e473b21e45b114440d91692acac6e3 (diff)
Cleaner diffmd-2023-03-17-v02
`make tag` or `make commit` run both tidy commands so to make the diff cleaner run them before to make the diff only contain changes of the real stuff.
-rwxr-xr-xmetadata/scripts/get-metadata.sh6
1 files changed, 1 insertions, 5 deletions
diff --git a/metadata/scripts/get-metadata.sh b/metadata/scripts/get-metadata.sh
index 16379681..095f391e 100755
--- a/metadata/scripts/get-metadata.sh
+++ b/metadata/scripts/get-metadata.sh
@@ -23,7 +23,6 @@ EOF
fi
xmldir=swamid-2.0
-update_xml=true
if echo "$metadataurl" | grep -qE '^http://|^https://' ; then
metadata=`curl -L -s -k -f "$metadataurl"`
elif echo "$metadataurl" | grep -qE '^reep:' ; then
@@ -38,7 +37,6 @@ else
[0-9][0-9]*)
xmldir=$(curl -L -m 5 -s -k -f "https://metadata.swamid.se/?show=feed&id=${metadataurl}")
urls="https://metadata.swamid.se/?rawXML=${metadataurl}"
- update_xml=false
;;
http*)
urls="$metadataurl"
@@ -87,9 +85,7 @@ case $x in
Y|y|"")
echo "$metadata" > $entityidfn
tmp=`mktemp`
- if $update_xml ; then
- xsltproc --stringparam regDate "$regdate" $script_cwd/../xslt/add-rpi.xsl ${entityidfn} > ${tmp} && mv ${tmp} ${entityidfn}
- fi
+ xsltproc --stringparam regDate "$regdate" $script_cwd/../xslt/add-rpi.xsl ${entityidfn} > ${tmp} && mv ${tmp} ${entityidfn}
xsltproc $script_cwd/../xslt/clean-entitydescriptor.xsl ${entityidfn} > ${tmp} && mv ${tmp} ${entityidfn}
if $new ; then