commit: 26ccdfc4d14f78e850630c9ff81c8a9ee229f274
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 29 04:26:01 2020 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 29 04:26:01 2020 +0000
URL:
https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=26ccdfc4
Update json path
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
json/generate-json.py => generate-json.py | 0
mirmon-distfiles.sh | 2 +-
mirmon-experimental.sh | 2 +-
mirmon-releases.sh | 2 +-
mirmon-rsync.sh | 2 +-
mirmon-snapshots.sh | 2 +-
6 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/json/generate-json.py b/generate-json.py
similarity index 100%
rename from json/generate-json.py
rename to generate-json.py
diff --git a/mirmon-distfiles.sh b/mirmon-distfiles.sh
index fedefdc..5738c99 100755
--- a/mirmon-distfiles.sh
+++ b/mirmon-distfiles.sh
@@ -14,5 +14,5 @@ sed \
-e 's#mirrors</H2>#<a
href="http://www.gentoo.org/main/en/mirrors2.xml">mirrors</a></H2>#' \
>../../htdocs/distfiles/index.html <../../htdocs/distfiles/index-wip.html
# Generate a json file containing the state of each mirror
-../json/generate-json.py
/var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/distfiles_mirrors/var/mirmon.state
\
+..//generate-json.py
/var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/distfiles_mirrors/var/mirmon.state
\
> ../../htdocs/distfiles/state.json
diff --git a/mirmon-experimental.sh b/mirmon-experimental.sh
index fae7df6..5b671bf 100755
--- a/mirmon-experimental.sh
+++ b/mirmon-experimental.sh
@@ -14,5 +14,5 @@ sed \
-e 's#mirrors</H2>#<a
href="http://www.gentoo.org/main/en/mirrors2.xml">mirrors</a></H2>#' \
>../../htdocs/experimental/index.html
<../../htdocs/experimental/index-wip.html
# Generate a json file containing the state of each mirror
-../json/generate-json.py
/var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/experimental_mirrors/var/mirmon.state
\
+..//generate-json.py
/var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/experimental_mirrors/var/mirmon.state
\
> ../../htdocs/experimental/state.json
diff --git a/mirmon-releases.sh b/mirmon-releases.sh
index 6790756..bbd5640 100755
--- a/mirmon-releases.sh
+++ b/mirmon-releases.sh
@@ -14,5 +14,5 @@ sed \
-e 's#mirrors</H2>#<a
href="http://www.gentoo.org/main/en/mirrors2.xml">mirrors</a></H2>#' \
>../../htdocs/releases/index.html <../../htdocs/releases/index-wip.html
# Generate a json file containing the state of each mirror
-../json/generate-json.py
/var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/releases_mirrors/var/mirmon.state
\
+..//generate-json.py
/var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/releases_mirrors/var/mirmon.state
\
> ../../htdocs/releases/state.json
diff --git a/mirmon-rsync.sh b/mirmon-rsync.sh
index 1e432e2..0f37f78 100755
--- a/mirmon-rsync.sh
+++ b/mirmon-rsync.sh
@@ -27,5 +27,5 @@ sed \
-e 's#mirrors</H2>#<a
href="http://www.gentoo.org/main/en/mirrors-rsync.xml">mirrors</a></H2>#' \
>../../htdocs/rsync/index.html <../../htdocs/rsync/index-wip.html
# Generate a json file containing the state of each mirror
-../json/generate-json.py
/var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/rsync_mirrors/var/mirmon.state
\
+..//generate-json.py
/var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/rsync_mirrors/var/mirmon.state
\
> ../../htdocs/rsync/state.json
diff --git a/mirmon-snapshots.sh b/mirmon-snapshots.sh
index ee0338b..b1198de 100755
--- a/mirmon-snapshots.sh
+++ b/mirmon-snapshots.sh
@@ -30,7 +30,7 @@ sed \
&& mv -f "${HTDOCS}"/index.html{.tmp,}
# Generate a json file containing the state of each mirror
-../json/generate-json.py \
+"${REPODIR}"/generate-json.py \
"${VARDIR}"/mirmon.state \
>"${HTDOCS}"/state.json.tmp \
&& mv -f "${HTDOCS}"/state.json{.tmp,}