From bea2dc61ff3fdb1a736b0dc5c742fc89f9846181 Mon Sep 17 00:00:00 2001 From: Chriztoffer Date: Sun, 2 Feb 2020 20:01:05 +0000 Subject: [PATCH 1/4] Update 'update.sh' --- update.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 455868c..c4754f1 100755 --- a/update.sh +++ b/update.sh @@ -56,7 +56,10 @@ Note the gortr file is DateTime stamped only, it is not signed with any certific ## [Last merge commit][0] at [dn42 registry][1] \`\`\` -$(git -C ../registry/ log -n 1 --merges | sed -E -e 's/^Author: ([a-zA-Z0-9]+) <.*>/Author: \1/' -e 's/^commit ([a-f0-9]+).*/commit \1/') +$(git -C ../registry/ log -n 1 --date=iso8601 --merges | + sed -E -e 's/^Author: ([a-zA-Z0-9]+) <.*>/Author: \1/' \ + -e 's/^commit ([a-f0-9]+) .*/commit \1/' \ + -e 's/[ ]+$//g' ) \`\`\` ## crontab From a3c9ac3cd628af377dd1187622889e6ae1ea3d30 Mon Sep 17 00:00:00 2001 From: Chriztoffer Date: Sun, 2 Feb 2020 20:01:05 +0000 Subject: [PATCH 2/4] Update 'roagen.php' --- roagen.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roagen.php b/roagen.php index f9e478b..546e802 100755 --- a/roagen.php +++ b/roagen.php @@ -6,11 +6,11 @@ require ("lib/define.php"); require ("lib/functions.php"); // Define array() we are going to populate with data. -$roas["_comments"]["modified"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%H'"); -$roas["_comments"]["modified"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%p'"); -$roas["_comments"]["modified"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%an <%ae>'"); -$roas["_comments"]["modified"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%aD'"); -$roas["_comments"]["modified"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%s'"); +$roas["_comments"]["modified"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%H'"); +$roas["_comments"]["modified"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%p'"); +$roas["_comments"]["modified"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%an <%ae>'"); +$roas["_comments"]["modified"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%aD'"); +$roas["_comments"]["modified"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%s'"); $roas["_comments"]["modified"]["url"] = "https://git.dn42.us/dn42/registry/commit/"; $roas["_comments"]["modified"]["url"] .= $roas["_comments"]["modified"]["commit"]; From ee98dbc519fec5751841aa7b5fba70570f306e15 Mon Sep 17 00:00:00 2001 From: Chriztoffer Date: Sun, 2 Feb 2020 20:01:05 +0000 Subject: [PATCH 3/4] Update 'rfc8416.php' --- rfc8416.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rfc8416.php b/rfc8416.php index 1e92fe1..e22d597 100755 --- a/rfc8416.php +++ b/rfc8416.php @@ -7,11 +7,11 @@ require ("lib/functions.php"); // Define array() we are going to populate with data. $roas["slurmVersion"] = 1; -$roas["_comments"]["modified"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%H'"); -$roas["_comments"]["modified"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%p'"); -$roas["_comments"]["modified"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%an <%ae>'"); -$roas["_comments"]["modified"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%aD'"); -$roas["_comments"]["modified"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%s'"); +$roas["_comments"]["modified"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%H'"); +$roas["_comments"]["modified"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%p'"); +$roas["_comments"]["modified"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%an <%ae>'"); +$roas["_comments"]["modified"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%aD'"); +$roas["_comments"]["modified"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%s'"); $roas["_comments"]["modified"]["url"] = "https://git.dn42.us/dn42/registry/commit/"; $roas["_comments"]["modified"]["url"] .= $roas["_comments"]["modified"]["commit"]; $roas["validationOutputFilters"]["prefixFilters"] = array(); From 469922a4f8dbad03e01eaa4bedc426f9e5a1f701 Mon Sep 17 00:00:00 2001 From: Chriztoffer Date: Sun, 2 Feb 2020 20:01:05 +0000 Subject: [PATCH 4/4] Update 'lib/functions.php' --- lib/functions.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/functions.php b/lib/functions.php index 4b14d90..fb0dc72 100755 --- a/lib/functions.php +++ b/lib/functions.php @@ -8,7 +8,7 @@ */ function checkoutMaster () { - echo shell_exec ("/usr/bin/git -C ../registry/ o master --quiet 2>&1"); + echo shell_exec ("/usr/bin/git -C ../registry/ checkout master --quiet 2>&1"); } /* @@ -65,13 +65,13 @@ function writeBirdConfig ($roas) $bird2_fq4 = fopen ('roa/bird4_route_dn42.conf', 'w'); $bird2_fq6 = fopen ('roa/bird6_route_dn42.conf', 'w'); - fwrite ($bird1_fq, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'")); - fwrite ($bird1_fq4, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'")); - fwrite ($bird1_fq6, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'")); + fwrite ($bird1_fq, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'")); + fwrite ($bird1_fq4, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'")); + fwrite ($bird1_fq6, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'")); - fwrite ($bird2_fq, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'")); - fwrite ($bird2_fq4, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'")); - fwrite ($bird2_fq6, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'")); + fwrite ($bird2_fq, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'")); + fwrite ($bird2_fq4, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'")); + fwrite ($bird2_fq6, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'")); foreach ($roas["roas"] as $roa) {