summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xansi-color-to-conky-color27
-rw-r--r--colors1
2 files changed, 18 insertions, 10 deletions
diff --git a/ansi-color-to-conky-color b/ansi-color-to-conky-color
index 9b9b1be..1748906 100755
--- a/ansi-color-to-conky-color
+++ b/ansi-color-to-conky-color
@@ -1,12 +1,21 @@
#!/bin/bash
+font=$(
sed '
- s@\x1b\[0m@ ${color}@g
- '"$(
- while read -r code color; do
- printf 's@\\x1b\\[\\(0;\\)\\?%sm@ ${color %s}@g\n' \
- "${code}" \
- "${color}"
- done \
- <"${0%/*}/colors"
- )"
+ s/^\s*font\s*=\s*'"'"'\([^'"'"']\+\)'"'"',\?\s*$/\1/
+ t
+ d
+ ' ~/.conkyrc
+)
+
+sed '
+ s@\x1b\[0m@ ${color}${font}@g
+ s@\x1b\[1m@ ${font '"${font}"':style=bold}@g
+'"$(
+ while read -r code color; do
+ printf 's@\\x1b\\[\\(0;\\)\\?%sm@ ${color %s}@g\n' \
+ "${code}" \
+ "${color}"
+ done \
+ <"${0%/*}/colors"
+)"
diff --git a/colors b/colors
index e6fd9fa..5357170 100644
--- a/colors
+++ b/colors
@@ -1,4 +1,3 @@
-1 #FFFFFF
30 #000000
31 #AA0000
32 #00AA00