commit ccd6151251e0f5077e1608522fcdb4d58e8d389a
parent fb74bc15155ab2beac19197675272f868ef2b6ac
Author: Matsuda Kenji <ftvda283@gmail.com>
Date: Sat, 29 Aug 2020 07:19:03 +0900
fixed bug on lunar cal
Diffstat:
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/.config/i3blocks/lunar_cal.sh b/.config/i3blocks/lunar_cal.sh
@@ -4,15 +4,17 @@ month_names=(睦月 如月 弥生 卯月 皐月 水無月 文月 葉月 長月
solar_cal=`date "+%Y,%-m,%d"`
lunar_cal=`grep ^$solar_cal lunar/calendar_j.csv | cut -d, -f10-`
-kanji_nums=(壱 弐 参 肆 伍 陸 漆 捌 玖)
+kanji_nums=(零 壱 弐 参 肆 伍 陸 漆 捌 玖)
year=`cut -d, -f1 <<<$lunar_cal`
-reiwa=${kanji_nums[$((year-2019))]}
+reiwa=$((year-2018))
+for i in `seq 0 $((${#reiwa}-1))`; do reiwa_kanji=$reiwa_kanji${kanji_nums[${reiwa:$i:1}]}; done
+reiwa=$reiwa_kanji
leap=`cut -d, -f2 <<<$lunar_cal`
month=`cut -d, -f3 <<<$lunar_cal`
date=`cut -d, -f4 <<<$lunar_cal`
-[ $date -lt 10 ] && date=${kanji_nums[$date-1]} \
- || date="${kanji_nums[${date:0:1}-1]}${kanji_nums[${date:1:1}-1]}"
+for i in `seq 0 $((${#date}-1))`; do date_kanji=$date_kanji${kanji_nums[${date:$i:1}]}; done
+date=$date_kanji
six_labels=`cut -d, -f5 <<<$lunar_cal`
zodiac=`cut -d, -f6 <<<$lunar_cal`
sekki24=`cut -d, -f7 <<<$lunar_cal`