From 62b4ca23e0ac41653a35ddbe95ed6262a5f49f97 Mon Sep 17 00:00:00 2001 From: emkael Date: Wed, 7 Jun 2017 13:12:02 +0200 Subject: Separate test dataset no longer needed --- bin/build.sh | 4 +--- bin/make-test.sh | 2 -- bin/make.sh | 2 +- config/dates.json | 15 ++++++++++++++- config/prod-dates.json | 14 -------------- config/test-dates.json | 14 -------------- 6 files changed, 16 insertions(+), 35 deletions(-) delete mode 100755 bin/make-test.sh mode change 120000 => 100644 config/dates.json delete mode 100644 config/prod-dates.json delete mode 100644 config/test-dates.json diff --git a/bin/build.sh b/bin/build.sh index 14b4f98..901bb41 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -1,10 +1,8 @@ #!/bin/bash CONFIG=$1 DIR=$2 -rm config/dates.json -ln -s $CONFIG config/dates.json PREV_DATE="" -cat config/dates.json | +cat $CONFIG | jq '.[] | .date, .url, .index, .name' | xargs -n4 | while read DATE URL INDEX NAME diff --git a/bin/make-test.sh b/bin/make-test.sh deleted file mode 100755 index 49961ec..0000000 --- a/bin/make-test.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -bin/build.sh test-dates.json http/test diff --git a/bin/make.sh b/bin/make.sh index 55f5e77..4bc8749 100755 --- a/bin/make.sh +++ b/bin/make.sh @@ -1,2 +1,2 @@ #!/bin/bash -bin/build.sh prod-dates.json http +bin/build.sh config/dates.json http diff --git a/config/dates.json b/config/dates.json deleted file mode 120000 index f302866..0000000 --- a/config/dates.json +++ /dev/null @@ -1 +0,0 @@ -prod-dates.json \ No newline at end of file diff --git a/config/dates.json b/config/dates.json new file mode 100644 index 0000000..48e324f --- /dev/null +++ b/config/dates.json @@ -0,0 +1,14 @@ +[ + { + "date": "2016-12-31", + "url": "2017-01.html", + "name": "I 2017", + "index": "1" + }, + { + "date": "2017-03-31", + "url": "index.html", + "name": "II 2017", + "index": "2" + } +] diff --git a/config/prod-dates.json b/config/prod-dates.json deleted file mode 100644 index 48e324f..0000000 --- a/config/prod-dates.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "date": "2016-12-31", - "url": "2017-01.html", - "name": "I 2017", - "index": "1" - }, - { - "date": "2017-03-31", - "url": "index.html", - "name": "II 2017", - "index": "2" - } -] diff --git a/config/test-dates.json b/config/test-dates.json deleted file mode 100644 index d7ac8f8..0000000 --- a/config/test-dates.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "date": "2016-12-31", - "url": "2017-01.html", - "name": "I 2017", - "index": "1" - }, - { - "date": "2017-04-30", - "url": "index.html", - "name": "II 2017", - "index": "2" - } -] -- cgit v1.2.3