From bcd3453ea4728b4c22d467db5b8ca8e5aa0f6b8e Mon Sep 17 00:00:00 2001 From: "Haoran S. Diao" <0@hairydiode.xyz> Date: Sat, 2 Mar 2019 12:39:29 -0500 Subject: fixed date display, added end condition, now it plays any file prepended with "song" when the time is up --- mitclock | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/mitclock b/mitclock index a161d6a..a584c2d 100755 --- a/mitclock +++ b/mitclock @@ -35,19 +35,27 @@ while [ $LOOP -eq 1 ]; do ceprint "#### #### #### ####" 4 c -2 ceprint "#### #### #### ####" 5 c -2 ceprint "#### #### #### ####" 6 c -2 - #Display Date in English - ENDATE=$(date -d@$(( 1552602480 - $(date +%s) )) \ + SECONDS=$(( 1552602480 - $(date +%s) )) + if [ $SECONDS -le 0 ]; then + LOOP=0 + #plays song + mocp -l song* + ceprint "成败尚未卜定" $(( $(tput lines) - 1 )) "n" 6 + break + fi + #Abuses date to display the difference between now and March 14 6:28 + ENDATE=$(TZ="GMT" date -d@$SECONDS \ "+%-j Days %H Hours %M Minutes %S Seconds"); - ENDATE=$(echo $ENDATE | awk '$1=$1-1') - CNDATE=$(date -d@$(( 1552602480 - $(date +%s) )) \ + ENDATE=$(echo $ENDATE | awk '{$1=$1-1;print $0}') + CNDATE=$(TZ="GMT" date -d@$SECONDS \ "+%-j 天 %H 时 %M 分 %S 秒"); - CNDATE=$(echo $CNDATE | awk '$1=$1-1') - ESDATE=$(date -d@$(( 1552602480 - $(date +%s) )) \ + CNDATE=$(echo $CNDATE | awk '{$1=$1-1;print $0}') + ESDATE=$(TZ="GMT" date -d@$SECONDS \ "+%-j Dias %H Horas %M Minutos %S Segundos"); - ESDATE=$(echo $ESDATE | awk '$1=$1-1') - JPDATE=$(date -d@$(( 1552602480 - $(date +%s) )) \ + ESDATE=$(echo $ESDATE | awk '{$1=$1-1;print $0}') + JPDATE=$(TZ="GMT" date -d@$SECONDS \ "+%-j 日 %H 时 %M 分 %S 秒"); - JPDATE=$(echo $JPDATE | awk '$1=$1-1') + JPDATE=$(echo $JPDATE | awk '{$1=$1-1;print $0}') ceprint "$ENDATE" 8 c 0 ceprint "$CNDATE" 9 c 4 -- cgit v1.1