summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremkael <emkael@tlen.pl>2017-06-07 13:12:02 +0200
committeremkael <emkael@tlen.pl>2017-06-07 13:57:20 +0200
commit62b4ca23e0ac41653a35ddbe95ed6262a5f49f97 (patch)
treea74975f9c8dbd34c85ebb731167707bf3774a192
parent35548990b2e148f083da44c6ceb5c6630af8bc2f (diff)
Separate test dataset no longer needed
-rwxr-xr-xbin/build.sh4
-rwxr-xr-xbin/make-test.sh2
-rwxr-xr-xbin/make.sh2
-rw-r--r--[l---------]config/dates.json15
-rw-r--r--config/prod-dates.json14
-rw-r--r--config/test-dates.json14
6 files changed, 16 insertions, 35 deletions
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
index f302866..48e324f 120000..100644
--- a/config/dates.json
+++ b/config/dates.json
@@ -1 +1,14 @@
-prod-dates.json \ No newline at end of file
+[
+ {
+ "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"
- }
-]