diff options
author | emkael <emkael@tlen.pl> | 2017-09-08 01:28:21 +0200 |
---|---|---|
committer | emkael <emkael@tlen.pl> | 2017-09-08 01:28:21 +0200 |
commit | 8f795b1d445441daab5ffb75060a6dbf8ed0934a (patch) | |
tree | 15e55a2a7e03867ac0cccfb8303674d478510503 | |
parent | 655a9847513332e8e119f37f7ed95f4ab002b1a1 (diff) |
Renaming scripts so that their names make sense
-rw-r--r-- | Makefile | 30 | ||||
-rw-r--r-- | _cron/cezar-db | 2 | ||||
-rwxr-xr-x | bin/build-players.sh | 4 | ||||
-rwxr-xr-x | bin/cezar-db-fetch.sh (renamed from bin/fetch-cezar-db.sh) | 0 | ||||
-rwxr-xr-x | bin/cezar-db-import.sh (renamed from bin/import-cezar-db.sh) | 0 | ||||
-rwxr-xr-x | bin/datafiles-build.sh (renamed from bin/build-datafiles.sh) | 2 | ||||
-rwxr-xr-x | bin/group-tools-json.sh (renamed from bin/generate-json.sh) | 2 | ||||
-rwxr-xr-x | bin/menus-build.sh (renamed from bin/write-menus.sh) | 2 | ||||
-rwxr-xr-x | bin/players-build.sh | 4 | ||||
-rwxr-xr-x | bin/rankings-csv-import.sh (renamed from bin/import-rankings.sh) | 0 | ||||
-rwxr-xr-x | bin/rankings-tables-build.sh (renamed from bin/build-rankings.sh) | 2 | ||||
-rwxr-xr-x | bin/rankings-target-files.sh (renamed from bin/target-ranking-files.sh) | 0 | ||||
-rwxr-xr-x | bin/statics-generate.sh (renamed from bin/generate-statics.sh) | 4 | ||||
-rw-r--r-- | scripts/datafiles-generate.py (renamed from scripts/datafile.py) | 0 | ||||
-rw-r--r-- | scripts/group-tools-json-generate.py (renamed from scripts/generate-json.py) | 0 | ||||
-rw-r--r-- | scripts/menus-compile.py (renamed from scripts/generate-static-menu.py) | 0 | ||||
-rw-r--r-- | scripts/menus-write.py (renamed from scripts/static-menu.py) | 0 | ||||
-rw-r--r-- | scripts/players-compile.py (renamed from scripts/players.py) | 0 | ||||
-rw-r--r-- | scripts/rankings-csv-convert.py (renamed from bin/convert-cezar-ranking-csv.py) | 0 | ||||
-rw-r--r-- | scripts/rankings-editions.py (renamed from scripts/editions.py) | 0 | ||||
-rw-r--r-- | scripts/rankings-tables-compile.py (renamed from scripts/ranking.py) | 0 | ||||
-rw-r--r-- | scripts/statics-compile.py (renamed from scripts/static.py) | 0 |
22 files changed, 26 insertions, 26 deletions
@@ -1,39 +1,39 @@ all: statics rankings players -targetfiles := $(shell bin/target-ranking-files.sh config/dates.json) +targetfiles := $(shell bin/rankings-target-files.sh config/dates.json) tmpfiles := $(patsubst %.html,http/%.html.tmp,$(targetfiles)) rankfiles := $(patsubst %.html,http/%.html.ed,$(targetfiles)) -rankings: datafiles menus tables editions json +rankings: datafiles menus tables editions group-json datafiles: - bin/build-datafiles.sh config/dates.json http/_data + bin/datafiles-build.sh config/dates.json http/_data menus: - bin/write-menus.sh config/static.json http + bin/menus-build.sh config/static.json http tables: - bin/build-rankings.sh config/dates.json http + bin/rankings-tables-build.sh config/dates.json http editions: $(rankfiles) $(rankfiles): - python scripts/editions.py $(patsubst %.ed,%,$@) - -json: - bin/generate-json.sh config/dates.json http + python scripts/rankings-editions.py $(patsubst %.ed,%,$@) players: - bin/build-players.sh http + bin/players-build.sh http statics: - python scripts/generate-static-menu.py config/static.json http http > http/.menu.html - bin/generate-statics.sh config/static.json static http + python scripts/menus-compile.py config/static.json http http > http/.menu.html + bin/statics-generate.sh config/static.json static http + +group-json: + bin/group-tools-json.sh config/dates.json http group-tools: - python scripts/static.py static/group-intro.html static/group-form-loading.html static/group-form.html > http/ranking-grupowy.html - python scripts/generate-static-menu.py config/static.json http http > http/.menu.html - python scripts/static-menu.py http/ranking-grupowy.html http/.menu.html + python scripts/statics-compile.py static/group-intro.html static/group-form-loading.html static/group-form.html > http/ranking-grupowy.html + python scripts/menus-compile.py config/static.json http http > http/.menu.html + python scripts/menus-write.py http/ranking-grupowy.html http/.menu.html minimize: $(tmpfiles) diff --git a/_cron/cezar-db b/_cron/cezar-db index ffa3271..8a16851 100644 --- a/_cron/cezar-db +++ b/_cron/cezar-db @@ -1 +1 @@ -0 1 1 1,4,7,10 * $SITEPATH/bin/fetch-cezar-db.sh +0 1 1 1,4,7,10 * $SITEPATH/bin/cezar-db-fetch.sh diff --git a/bin/build-players.sh b/bin/build-players.sh deleted file mode 100755 index e1d099d..0000000 --- a/bin/build-players.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -DIR=$1 -mkdir -p $DIR/players -python scripts/players.py $DIR/players $DIR/players/.menu.html diff --git a/bin/fetch-cezar-db.sh b/bin/cezar-db-fetch.sh index 3af7357..3af7357 100755 --- a/bin/fetch-cezar-db.sh +++ b/bin/cezar-db-fetch.sh diff --git a/bin/import-cezar-db.sh b/bin/cezar-db-import.sh index 4db5261..4db5261 100755 --- a/bin/import-cezar-db.sh +++ b/bin/cezar-db-import.sh diff --git a/bin/build-datafiles.sh b/bin/datafiles-build.sh index 82c2e9c..5c336ff 100755 --- a/bin/build-datafiles.sh +++ b/bin/datafiles-build.sh @@ -6,6 +6,6 @@ cat $CONFIG | jq -r '.[] | .date' | while read DATE do - python scripts/datafile.py $DATE $PREV_DATE > "$DIR/$DATE.json" + python scripts/datafiles-generate.py $DATE $PREV_DATE > "$DIR/$DATE.json" PREV_DATE=$DATE done diff --git a/bin/generate-json.sh b/bin/group-tools-json.sh index d856a89..e6f04c8 100755 --- a/bin/generate-json.sh +++ b/bin/group-tools-json.sh @@ -2,4 +2,4 @@ CONFIG=$1 OUTPUT=$2 LAST_DATE=`cat $CONFIG | jq -r '.[] | .date' | sort | tail -n1` -python scripts/generate-json.py $LAST_DATE > $OUTPUT/_data/group-data.json +python scripts/group-tools-json-generate.py $LAST_DATE > $OUTPUT/_data/group-data.json diff --git a/bin/write-menus.sh b/bin/menus-build.sh index 500db52..0ac3a92 100755 --- a/bin/write-menus.sh +++ b/bin/menus-build.sh @@ -5,5 +5,5 @@ mkdir -p $DIRECTORY/players find $DIRECTORY -type d -not -name _\* | while read HTMLDIR do - python scripts/generate-static-menu.py $CONFIG_FILE $DIRECTORY $HTMLDIR > $HTMLDIR/.menu.html + python scripts/menus-compile.py $CONFIG_FILE $DIRECTORY $HTMLDIR > $HTMLDIR/.menu.html done diff --git a/bin/players-build.sh b/bin/players-build.sh new file mode 100755 index 0000000..06fdf4f --- /dev/null +++ b/bin/players-build.sh @@ -0,0 +1,4 @@ +#!/bin/bash +DIR=$1 +mkdir -p $DIR/players +python scripts/players-compile.py $DIR/players $DIR/players/.menu.html diff --git a/bin/import-rankings.sh b/bin/rankings-csv-import.sh index 90ce6bc..90ce6bc 100755 --- a/bin/import-rankings.sh +++ b/bin/rankings-csv-import.sh diff --git a/bin/build-rankings.sh b/bin/rankings-tables-build.sh index c51fa1d..0d85972 100755 --- a/bin/build-rankings.sh +++ b/bin/rankings-tables-build.sh @@ -6,5 +6,5 @@ cat $CONFIG | xargs -n4 | while read DATE URL INDEX NAME do - python scripts/ranking.py "$NAME" $INDEX $DIR/.menu.html $DATE > $DIR/$URL + python scripts/rankings-tables-compile.py "$NAME" $INDEX $DIR/.menu.html $DATE > $DIR/$URL done diff --git a/bin/target-ranking-files.sh b/bin/rankings-target-files.sh index 001834f..001834f 100755 --- a/bin/target-ranking-files.sh +++ b/bin/rankings-target-files.sh diff --git a/bin/generate-statics.sh b/bin/statics-generate.sh index 4369aa7..9c2fa92 100755 --- a/bin/generate-statics.sh +++ b/bin/statics-generate.sh @@ -10,7 +10,7 @@ cat $1 | read OUTPUT_FILE if [ -n "$CONTENT_FILE" ] then - python scripts/static.py $CONTENT_DIR/$CONTENT_FILE "$HEADER" > $OUTPUT_DIR/$OUTPUT_FILE - python scripts/static-menu.py $OUTPUT_DIR/$OUTPUT_FILE $OUTPUT_DIR/.menu.html + python scripts/statics-compile.py $CONTENT_DIR/$CONTENT_FILE "$HEADER" > $OUTPUT_DIR/$OUTPUT_FILE + python scripts/menus-write.py $OUTPUT_DIR/$OUTPUT_FILE $OUTPUT_DIR/.menu.html fi done diff --git a/scripts/datafile.py b/scripts/datafiles-generate.py index 5cee451..5cee451 100644 --- a/scripts/datafile.py +++ b/scripts/datafiles-generate.py diff --git a/scripts/generate-json.py b/scripts/group-tools-json-generate.py index 54bb26d..54bb26d 100644 --- a/scripts/generate-json.py +++ b/scripts/group-tools-json-generate.py diff --git a/scripts/generate-static-menu.py b/scripts/menus-compile.py index 7c9fd64..7c9fd64 100644 --- a/scripts/generate-static-menu.py +++ b/scripts/menus-compile.py diff --git a/scripts/static-menu.py b/scripts/menus-write.py index e30c702..e30c702 100644 --- a/scripts/static-menu.py +++ b/scripts/menus-write.py diff --git a/scripts/players.py b/scripts/players-compile.py index 613c01f..613c01f 100644 --- a/scripts/players.py +++ b/scripts/players-compile.py diff --git a/bin/convert-cezar-ranking-csv.py b/scripts/rankings-csv-convert.py index 4dcee92..4dcee92 100644 --- a/bin/convert-cezar-ranking-csv.py +++ b/scripts/rankings-csv-convert.py diff --git a/scripts/editions.py b/scripts/rankings-editions.py index 42d036f..42d036f 100644 --- a/scripts/editions.py +++ b/scripts/rankings-editions.py diff --git a/scripts/ranking.py b/scripts/rankings-tables-compile.py index 52b036f..52b036f 100644 --- a/scripts/ranking.py +++ b/scripts/rankings-tables-compile.py diff --git a/scripts/static.py b/scripts/statics-compile.py index 16d82ae..16d82ae 100644 --- a/scripts/static.py +++ b/scripts/statics-compile.py |