| 1 |
commit: 26ccdfc4d14f78e850630c9ff81c8a9ee229f274 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 29 04:26:01 2020 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 29 04:26:01 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=26ccdfc4 |
| 7 |
|
| 8 |
Update json path |
| 9 |
|
| 10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 11 |
|
| 12 |
json/generate-json.py => generate-json.py | 0 |
| 13 |
mirmon-distfiles.sh | 2 +- |
| 14 |
mirmon-experimental.sh | 2 +- |
| 15 |
mirmon-releases.sh | 2 +- |
| 16 |
mirmon-rsync.sh | 2 +- |
| 17 |
mirmon-snapshots.sh | 2 +- |
| 18 |
6 files changed, 5 insertions(+), 5 deletions(-) |
| 19 |
|
| 20 |
diff --git a/json/generate-json.py b/generate-json.py |
| 21 |
similarity index 100% |
| 22 |
rename from json/generate-json.py |
| 23 |
rename to generate-json.py |
| 24 |
|
| 25 |
diff --git a/mirmon-distfiles.sh b/mirmon-distfiles.sh |
| 26 |
index fedefdc..5738c99 100755 |
| 27 |
--- a/mirmon-distfiles.sh |
| 28 |
+++ b/mirmon-distfiles.sh |
| 29 |
@@ -14,5 +14,5 @@ sed \ |
| 30 |
-e 's#mirrors</H2>#<a href="http://www.gentoo.org/main/en/mirrors2.xml">mirrors</a></H2>#' \ |
| 31 |
>../../htdocs/distfiles/index.html <../../htdocs/distfiles/index-wip.html |
| 32 |
# Generate a json file containing the state of each mirror |
| 33 |
-../json/generate-json.py /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/distfiles_mirrors/var/mirmon.state \ |
| 34 |
+..//generate-json.py /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/distfiles_mirrors/var/mirmon.state \ |
| 35 |
> ../../htdocs/distfiles/state.json |
| 36 |
|
| 37 |
diff --git a/mirmon-experimental.sh b/mirmon-experimental.sh |
| 38 |
index fae7df6..5b671bf 100755 |
| 39 |
--- a/mirmon-experimental.sh |
| 40 |
+++ b/mirmon-experimental.sh |
| 41 |
@@ -14,5 +14,5 @@ sed \ |
| 42 |
-e 's#mirrors</H2>#<a href="http://www.gentoo.org/main/en/mirrors2.xml">mirrors</a></H2>#' \ |
| 43 |
>../../htdocs/experimental/index.html <../../htdocs/experimental/index-wip.html |
| 44 |
# Generate a json file containing the state of each mirror |
| 45 |
-../json/generate-json.py /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/experimental_mirrors/var/mirmon.state \ |
| 46 |
+..//generate-json.py /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/experimental_mirrors/var/mirmon.state \ |
| 47 |
> ../../htdocs/experimental/state.json |
| 48 |
|
| 49 |
diff --git a/mirmon-releases.sh b/mirmon-releases.sh |
| 50 |
index 6790756..bbd5640 100755 |
| 51 |
--- a/mirmon-releases.sh |
| 52 |
+++ b/mirmon-releases.sh |
| 53 |
@@ -14,5 +14,5 @@ sed \ |
| 54 |
-e 's#mirrors</H2>#<a href="http://www.gentoo.org/main/en/mirrors2.xml">mirrors</a></H2>#' \ |
| 55 |
>../../htdocs/releases/index.html <../../htdocs/releases/index-wip.html |
| 56 |
# Generate a json file containing the state of each mirror |
| 57 |
-../json/generate-json.py /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/releases_mirrors/var/mirmon.state \ |
| 58 |
+..//generate-json.py /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/releases_mirrors/var/mirmon.state \ |
| 59 |
> ../../htdocs/releases/state.json |
| 60 |
|
| 61 |
diff --git a/mirmon-rsync.sh b/mirmon-rsync.sh |
| 62 |
index 1e432e2..0f37f78 100755 |
| 63 |
--- a/mirmon-rsync.sh |
| 64 |
+++ b/mirmon-rsync.sh |
| 65 |
@@ -27,5 +27,5 @@ sed \ |
| 66 |
-e 's#mirrors</H2>#<a href="http://www.gentoo.org/main/en/mirrors-rsync.xml">mirrors</a></H2>#' \ |
| 67 |
>../../htdocs/rsync/index.html <../../htdocs/rsync/index-wip.html |
| 68 |
# Generate a json file containing the state of each mirror |
| 69 |
-../json/generate-json.py /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/rsync_mirrors/var/mirmon.state \ |
| 70 |
+..//generate-json.py /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/rsync_mirrors/var/mirmon.state \ |
| 71 |
> ../../htdocs/rsync/state.json |
| 72 |
|
| 73 |
diff --git a/mirmon-snapshots.sh b/mirmon-snapshots.sh |
| 74 |
index ee0338b..b1198de 100755 |
| 75 |
--- a/mirmon-snapshots.sh |
| 76 |
+++ b/mirmon-snapshots.sh |
| 77 |
@@ -30,7 +30,7 @@ sed \ |
| 78 |
&& mv -f "${HTDOCS}"/index.html{.tmp,} |
| 79 |
|
| 80 |
# Generate a json file containing the state of each mirror |
| 81 |
-../json/generate-json.py \ |
| 82 |
+"${REPODIR}"/generate-json.py \ |
| 83 |
"${VARDIR}"/mirmon.state \ |
| 84 |
>"${HTDOCS}"/state.json.tmp \ |
| 85 |
&& mv -f "${HTDOCS}"/state.json{.tmp,} |
Archives