rewrite builder.sh

8 files changed, 169 insertions, 21 deletions

diff --git a/builder.sh b/builder.sh
index 27aacfc..2efe5d3 100755
--- a/builder.sh
+++ b/builder.sh
@@ -32,7 +32,7 @@ declare -g tokenDecG
 declare -g tokenDecB
 
 readarray -t schemesFiles < <(find "$schemesPath" -type f -iname '*.yaml')
-readarray -t necessaryTokensPaletteList < <(grep -oP '\{\{\K[^}]+(?=\}\})' "$bodyFileTemplate" | awk -F'.' '{print $1}' | sort -u)
+readarray -t necessaryTokensPaletteList < <(grep -oP '\{\{\K[^}]+(?=\}\})' "$bodyFileTemplate" | awk -F'-' '{print $1}' | sort -u)
 
 function getProperty() {
 	yq -oy "$schemeFile" | yq -o=json -r ".$1"
@@ -114,22 +114,20 @@ for schemeFile in "${schemesFiles[@]}"; do
 				--arg tokenDecG "$tokenDecG" \
 				--arg tokenDecB "$tokenDecB" \
 				'{
-					($tokenName): { 
-						"hex": $tokenHex,
-						"bgr": $tokenBgr,
-						"hex-r": $tokenHexR,
-						"hex-g": $tokenHexG,
-						"hex-b": $tokenHexB,
-						"rgb-r": $tokenRgbR,
-						"rgb-g": $tokenRgbG,
-						"rgb-b": $tokenRgbB,
-						"rgb16-r": $tokenRgb16R,
-						"rgb16-g": $tokenRgb16G,
-						"rgb16-b": $tokenRgb16B,
-						"dec-r": $tokenDecR,
-						"dec-g": $tokenDecG,
-						"dec-b": $tokenDecB
-					},
+					($tokenName + "-hex"): $tokenHex, 
+					($tokenName + "-bgr"): $tokenBgr,
+					($tokenName + "-hex-r"): $tokenHexR,
+					($tokenName + "-hex-g"): $tokenHexG,
+					($tokenName + "-hex-b"): $tokenHexB,
+					($tokenName + "-rgb-r"): $tokenRgbR,
+					($tokenName + "-rgb-g"): $tokenRgbG,
+					($tokenName + "-rgb-b"): $tokenRgbB,
+					($tokenName + "-rgb16-r"): $tokenRgb16R,
+					($tokenName + "-rgb16-g"): $tokenRgb16G,
+					($tokenName + "-rgb16-b"): $tokenRgb16B,
+					($tokenName + "-dec-r"): $tokenDecR,
+					($tokenName + "-dec-g"): $tokenDecG,
+					($tokenName + "-dec-b"): $tokenDecB
 				}'
 		)
 
diff --git a/colors/base16-black-metal-dark-funeral.yaml b/colors/base16-black-metal-dark-funeral.yaml
new file mode 100644
index 0000000..ae0e6df
--- /dev/null
+++ b/colors/base16-black-metal-dark-funeral.yaml
@@ -0,0 +1,25 @@
+/*
+*
+* name: Black Metal (Dark Funeral)
+* author: metalelf0 (https://github.com/metalelf0)
+* slug: black-metal-dark-funeral
+* slug-underscored: black_metal_dark_funeral
+* system: base16
+* variant: dark
+* is-dark-variant: true
+*
+*/
+
+window {
+    background-color: #000000;
+    border-color: #888888;
+}
+
+button,
+image {
+    color: #999999;
+}
+
+button:hover {
+    background-color: rgba(193, 193, 193, 0.4);
+}
diff --git a/colors/base16-black-metal.yaml b/colors/base16-black-metal.yaml
new file mode 100644
index 0000000..b4ee3b4
--- /dev/null
+++ b/colors/base16-black-metal.yaml
@@ -0,0 +1,25 @@
+/*
+*
+* name: Black Metal
+* author: metalelf0 (https://github.com/metalelf0)
+* slug: black-metal
+* slug-underscored: black_metal
+* system: base16
+* variant: dark
+* is-dark-variant: true
+*
+*/
+
+window {
+    background-color: #000000;
+    border-color: #888888;
+}
+
+button,
+image {
+    color: #999999;
+}
+
+button:hover {
+    background-color: rgba(193, 193, 193, 0.4);
+}
diff --git a/colors/base16-default-light.yaml b/colors/base16-default-light.yaml
new file mode 100644
index 0000000..8893d77
--- /dev/null
+++ b/colors/base16-default-light.yaml
@@ -0,0 +1,25 @@
+/*
+*
+* name: Default Light
+* author: Chris Kempson (http://chriskempson.com)
+* slug: default-light
+* slug-underscored: default_light
+* system: base16
+* variant: light
+* is-light-variant: true
+*
+*/
+
+window {
+    background-color: #f8f8f8;
+    border-color: #7cafc2;
+}
+
+button,
+image {
+    color: #585858;
+}
+
+button:hover {
+    background-color: rgba(24, 24, 24, 0.4);
+}
diff --git a/colors/base16-fruit-soda.yaml b/colors/base16-fruit-soda.yaml
new file mode 100644
index 0000000..1777ea9
--- /dev/null
+++ b/colors/base16-fruit-soda.yaml
@@ -0,0 +1,25 @@
+/*
+*
+* name: Fruit Soda
+* author: jozip
+* slug: fruit-soda
+* slug-underscored: fruit_soda
+* system: base16
+* variant: light
+* is-light-variant: true
+*
+*/
+
+window {
+    background-color: #f1ecf1;
+    border-color: #2931df;
+}
+
+button,
+image {
+    color: #979598;
+}
+
+button:hover {
+    background-color: rgba(45, 44, 44, 0.4);
+}
diff --git a/colors/base16-gruvbox-dark-soft.yaml b/colors/base16-gruvbox-dark-soft.yaml
new file mode 100644
index 0000000..645dc0f
--- /dev/null
+++ b/colors/base16-gruvbox-dark-soft.yaml
@@ -0,0 +1,25 @@
+/*
+*
+* name: Gruvbox dark, soft
+* author: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
+* slug: gruvbox-dark-soft
+* slug-underscored: gruvbox_dark_soft
+* system: base16
+* variant: dark
+* is-dark-variant: true
+*
+*/
+
+window {
+    background-color: #32302f;
+    border-color: #83a598;
+}
+
+button,
+image {
+    color: #bdae93;
+}
+
+button:hover {
+    background-color: rgba(251, 241, 199, 0.4);
+}
diff --git a/colors/base16-mexico-light.yaml b/colors/base16-mexico-light.yaml
new file mode 100644
index 0000000..fcf8e60
--- /dev/null
+++ b/colors/base16-mexico-light.yaml
@@ -0,0 +1,25 @@
+/*
+*
+* name: Mexico Light
+* author: Sheldon Johnson
+* slug: mexico-light
+* slug-underscored: mexico_light
+* system: base16
+* variant: light
+* is-light-variant: true
+*
+*/
+
+window {
+    background-color: #f8f8f8;
+    border-color: #7cafc2;
+}
+
+button,
+image {
+    color: #585858;
+}
+
+button:hover {
+    background-color: rgba(24, 24, 24, 0.4);
+}
diff --git a/templates/body.mustache b/templates/body.mustache
index 94173bd..5b84027 100644
--- a/templates/body.mustache
+++ b/templates/body.mustache
@@ -1,13 +1,13 @@
 window {
-    background-color: #{{base00.hex}};
-    border-color: #{{base0D.hex}};
+    background-color: #{{base00-hex}};
+    border-color: #{{base0D-hex}};
 }
 
 button,
 image {
-    color: #{{base04.hex}};
+    color: #{{base04-hex}};
 }
 
 button:hover {
-    background-color: rgba({{base07.rgb-r}}, {{base07.rgb-g}}, {{base07.rgb-b}}, 0.4);
+    background-color: rgba({{base07-rgb-r}}, {{base07-rgb-g}}, {{base07-rgb-b}}, 0.4);
 }