From b9b1d438ea50a47c2e49917958469ca34876413e Mon Sep 17 00:00:00 2001 From: Shiham Abdul Rahman Date: Fri, 9 Sep 2022 12:23:16 +0500 Subject: [PATCH] everything works, need some allignment i guess --- namaadhuvaguthu.sh | 55 ++++++++++++++++++++++++++++------------------ outputtime.sh | 30 +++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 21 deletions(-) create mode 100644 outputtime.sh diff --git a/namaadhuvaguthu.sh b/namaadhuvaguthu.sh index 83a7478..305a23d 100755 --- a/namaadhuvaguthu.sh +++ b/namaadhuvaguthu.sh @@ -1,25 +1,31 @@ #!/bin/bash -DATE=$1 -ATOLL=$2 -ISLAND=$3 INPUT=prayer.png OUTPUT=prayer_added.png +PRAYERTIMES_CSV="male.csv" +DAY_OF_YEAR=$(($(date -d "@$(date +%s)" +%j) - 1)) + rm $OUTPUT > /dev/null - - -convertPTToHuman() { - # echo $1 - if (( $(( $1 / 60 )) > 9 )) ; then - echo "$(( $1 / 60 )):$(( $1 % 60 ))" - else - echo "0$(( $1 / 60 )):$(( $1 % 60 ))" - fi - # echo "$(( $1 / 60 )):$(( $1 % 60 ))" +#human() { +# if (( $(( $1 / 60 )) > 9 )) ; then +# echo "$(( $1 / 60 )):$(( $1 % 60 ))" +# else +# echo "0$(( $1 / 60 )):$(( $1 % 60 ))" +# fi +#} +human() { + HOUR="$(( $1 / 60 ))" + if (( $(( $1 / 60 )) < 10 )) ; then + HOUR="0$(( $1 / 60 ))" + fi + MINUTE="$(( $1 % 60 ))" + if (( $(( $1 % 60 )) < 10 )) ; then + MINUTE="0$(( $1 % 60 ))" + fi + echo "$HOUR:$MINUTE" } - imagemagick(){ TIME=$1 PRAYER=$2 @@ -49,7 +55,7 @@ then INPUT=$OUTPUT fi -echo Island=$ISLAND Prayer=$PRAYER Date=$DATE File=$OUTPUT +echo Prayer=$PRAYER DayOfYear=$DAY_OF_YEAR Time=$TIME File=$OUTPUT convert $INPUT \ -font $PWD/CourierPrime.ttf \ @@ -59,11 +65,18 @@ convert $INPUT \ $OUTPUT } -imagemagick $DATE fathis -imagemagick $DATE iruaraa -imagemagick $DATE mendhuru -imagemagick $DATE asr -imagemagick $DATE magrib -imagemagick $DATE isha +Fajr=$(grep "^$DAY_OF_YEAR," $PRAYERTIMES_CSV | cut -d, -f2) +Sunrise=$(grep "^$DAY_OF_YEAR," $PRAYERTIMES_CSV | cut -d, -f3) +Dhuhr=$(grep "^$DAY_OF_YEAR," $PRAYERTIMES_CSV | cut -d, -f4) +Asr=$(grep "^$DAY_OF_YEAR," $PRAYERTIMES_CSV | cut -d, -f5) +Maghrib=$(grep "^$DAY_OF_YEAR," $PRAYERTIMES_CSV | cut -d, -f6) +Isha=$(grep "^$DAY_OF_YEAR," $PRAYERTIMES_CSV | cut -d, -f7) + +imagemagick $(human $Fajr) fathis +imagemagick $(human $Sunrise) iruaraa +imagemagick $(human $Dhuhr) mendhuru +imagemagick $(human $Asr) asr +imagemagick $(human $Maghrib) magrib +imagemagick $(human $Isha) isha feh $OUTPUT diff --git a/outputtime.sh b/outputtime.sh new file mode 100644 index 0000000..024ac5f --- /dev/null +++ b/outputtime.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +PRAYERTIMES_CSV="male.csv" +DAY_OF_YEAR=$(($(date -d "@$(date +%s)" +%j) - 1)) + +human() { + HOUR="$(( $1 / 60 ))" + if (( $(( $1 / 60 )) < 10 )) ; then + HOUR="0$(( $1 / 60 ))" + fi + MINUTE="$(( $1 % 60 ))" + if (( $(( $1 % 60 )) < 10 )) ; then + MINUTE="0$(( $1 % 60 ))" + fi + echo "$HOUR:$MINUTE" +} + +Fajr=$(grep "^$DAY_OF_YEAR," $PRAYERTIMES_CSV | cut -d, -f2) +Sunrise=$(grep "^$DAY_OF_YEAR," $PRAYERTIMES_CSV | cut -d, -f3) +Dhuhr=$(grep "^$DAY_OF_YEAR," $PRAYERTIMES_CSV | cut -d, -f4) +Asr=$(grep "^$DAY_OF_YEAR," $PRAYERTIMES_CSV | cut -d, -f5) +Maghrib=$(grep "^$DAY_OF_YEAR," $PRAYERTIMES_CSV | cut -d, -f6) +Isha=$(grep "^$DAY_OF_YEAR," $PRAYERTIMES_CSV | cut -d, -f7) + +echo Fajr $(human $Fajr) +echo Sunrize $(human $Sunrise) +echo Dhuhr $(human $Dhuhr) +echo Asr $(human $Asr) +echo Maghrib $(human $Maghrib) +echo Isha $(human $Isha)