From c90356bfe105af7d038d9c6b00dd98bbe51c154d Mon Sep 17 00:00:00 2001 From: David Coomber <47242934+dcoomber@users.noreply.github.com> Date: Sat, 13 Aug 2022 17:11:27 +0200 Subject: [PATCH] Misc. grammar / formatting changes --- examples/question.sh | 8 ++++---- mycommands.sh | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/question.sh b/examples/question.sh index 6974888..0244e44 100755 --- a/examples/question.sh +++ b/examples/question.sh @@ -31,7 +31,7 @@ unset IFS # kill interactive script if not finished in time, e.g. user away or error MAXWAIT="1m" -{ sleep "${MAXWAIT}"; printf "Stopping Questionnaire after %s, you need to much time to finish ... BYE\n" "${MAXWAIT}"; kill $$; wait 2>/dev/null ;} & +{ sleep "${MAXWAIT}"; printf "Stopping questionnaire after %s. You've taken too much time to finish! BYE\n" "${MAXWAIT}"; kill $$; wait 2>/dev/null ;} & # simple yes/no question, defaults to no printf "Hi, hello there\nWould you like some tea (y/n)?\n" @@ -39,15 +39,15 @@ read -r answer <"${INPUT}" if [[ ${answer,,} == "y"* ]]; then printf "OK then, here you go: http://www.rivertea.com/blog/wp-content/uploads/2013/12/Green-Tea.jpg\n" else - printf "OK then, no tea ...\n" + printf "OK then, no tea...\n" fi # question with Keyboard, repeating until correct answer given until [ "${SUCCESS}" = "y" ] ;do - printf 'Do you like Music? mykeyboardstartshere "Yass!" , "No"\n' + printf 'Do you like music? mykeyboardstartshere "Yass!" , "No"\n' read -r answer <"${INPUT}" case ${answer,,} in - '') printf "empty answer! Try again\n";; + '') printf "Empty answer! Try again\n";; 'yass'*) printf "Goody! mykeyboardendshere\n";SUCCESS=y;; 'no'*) printf "Well that's weird. mykeyboardendshere\n";SUCCESS=y;; *) SUCCESS=n;; diff --git a/mycommands.sh b/mycommands.sh index 6a894e5..1a80153 100644 --- a/mycommands.sh +++ b/mycommands.sh @@ -123,22 +123,22 @@ else case "${MESSAGE}" in ################## - # example commands, replace them by your own + # example commands, replace them with your own '/_dice_re'*) # dice from user received sleep 5 - local gameresult="*Congratulation ${USER[FIRST_NAME]} ${USER[LAST_NAME]}* you got *${MESSAGE[RESULT]} Points*." + local gameresult="*Congratulations, ${USER[FIRST_NAME]} ${USER[LAST_NAME]}*, you got *${MESSAGE[RESULT]} points*." [ -z "${FORWARD[UID]}" ] && send_markdownv2_message "${CHAT[ID]}" "${gameresult}" ;; '/game'*) # send random dice, edit list to fit your needs send_dice "${CHAT[ID]}" ":$(printf "slot_machine\ngame_die\ndart\nbasketball\nsoccer\nslot_machine"|sort -R|shuf -n 1shuf -n 1):" if [ "${BOTSENT[OK]}" = "true" ]; then - local gameresult="*Congratulation ${USER[FIRST_NAME]}* ${USER[LAST_NAME]} you got *${BOTSENT[RESULT]} Points*." + local gameresult="*Congratulations, ${USER[FIRST_NAME]} ${USER[LAST_NAME]}*, you got *${BOTSENT[RESULT]} points*." sleep 5 case "${BOTSENT[RESULT]}" in - 1) gameresult="*Sorry* only *one Point* ...";; - 2) gameresult="*Hey*, 2 Points are *more then one!*";; - 5|6) [[ "${BOTSENT[EMOJI]}" =~ fb0$ ]] || gameresult="*Super! ${BOTSENT[RESULT]} Points!*";; - 6*) gameresult="*JACKPOT! ${BOTSENT[RESULT]} Points!*";; + 1) gameresult="*Sorry* only *one point* ...";; + 2) gameresult="*Hey*, 2 points are *better than one!*";; + 5|6) [[ "${BOTSENT[EMOJI]}" =~ fb0$ ]] || gameresult="*Super! You got ${BOTSENT[RESULT]} points!*";; + 6*) gameresult="*JACKPOT! ${BOTSENT[RESULT]} points!*";; esac send_markdownv2_message "${CHAT[ID]}" "${gameresult}" fi