From d905fa72d719544407fb776b9520b481116c0ced Mon Sep 17 00:00:00 2001 From: rjpadilla Date: Wed, 24 Mar 2021 23:56:15 +0300 Subject: [PATCH 1/3] update message.sh (fixes #2122) --- modules/message.sh | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/modules/message.sh b/modules/message.sh index 62f742250c..00a97b257a 100644 --- a/modules/message.sh +++ b/modules/message.sh @@ -231,6 +231,38 @@ function message { log_comment_and_exit1 "Error: You do not have an authorized access token" "To get access token, run $BASENAME message gitter apitoken" fi ;; + "") + if check_apitoken gitter; then + + + echo "You must provide a subcommand for $BASENAME message gitter listed below:" + echo " $BASENAME message gitter apitoken" + echo " Check for API token for gitter" + echo + echo " $BASENAME message gitter authorize \"1234567890\"" + echo " Sets and saves API token" + echo + echo " $BASENAME message gitter channels" + echo " check for channels" + echo + echo " $BASENAME message gitter send treehouses/Lobby \"Hi, you are very awesome\"" + echo " Sends a message to a gitter channel" + echo + echo " $BASENAME message gitter show treehouses/Lobby" + echo " Marks unread messages from a gitter channel to read" + echo + echo " $BASENAME message gitter read treehouses/Lobby" + echo " Receives and displays unread messages from a gitter channel" + echo + echo " $BASENAME message gitter mark treehouses/Lobby" + echo " Marks unread messages from a gitter channel to read" + echo + else + echo "You do not have a gitter apitoken setup." + echo "For instructions to configure your gitter apitoken" + echo "Please run: $BASENAME message gitter apitoken" + fi + ;; *) log_help_and_exit1 "Error: This command does not exist" message ;; From 8d3c2eac023758e3e78b9d90cb71cfbb0117e155 Mon Sep 17 00:00:00 2001 From: rjpadilla Date: Fri, 26 Mar 2021 04:42:53 +0300 Subject: [PATCH 2/3] update message.sh (fixes #2122) --- modules/message.sh | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/modules/message.sh b/modules/message.sh index 00a97b257a..d73cf2540e 100644 --- a/modules/message.sh +++ b/modules/message.sh @@ -233,30 +233,26 @@ function message { ;; "") if check_apitoken gitter; then - - - echo "You must provide a subcommand for $BASENAME message gitter listed below:" - echo " $BASENAME message gitter apitoken" - echo " Check for API token for gitter" - echo - echo " $BASENAME message gitter authorize \"1234567890\"" - echo " Sets and saves API token" - echo - echo " $BASENAME message gitter channels" - echo " check for channels" - echo - echo " $BASENAME message gitter send treehouses/Lobby \"Hi, you are very awesome\"" - echo " Sends a message to a gitter channel" - echo - echo " $BASENAME message gitter show treehouses/Lobby" - echo " Marks unread messages from a gitter channel to read" - echo - echo " $BASENAME message gitter read treehouses/Lobby" - echo " Receives and displays unread messages from a gitter channel" - echo - echo " $BASENAME message gitter mark treehouses/Lobby" - echo " Marks unread messages from a gitter channel to read" - echo + get_apitoken gitter + echo + echo "You have successfully configured your Gitter apitoken." + echo "Now you must provide a subcommand for $BASENAME message gitter listed below:" + echo + echo " $BASENAME message gitter channels" + echo " check for channels" + echo + echo " $BASENAME message gitter send treehouses/Lobby \"Hi, you are very awesome\"" + echo " Sends a message to a gitter channel" + echo + echo " $BASENAME message gitter show treehouses/Lobby" + echo " Marks unread messages from a gitter channel to read" + echo + echo " $BASENAME message gitter read treehouses/Lobby" + echo " Receives and displays unread messages from a gitter channel" + echo + echo " $BASENAME message gitter mark treehouses/Lobby" + echo " Marks unread messages from a gitter channel to read" + echo else echo "You do not have a gitter apitoken setup." echo "For instructions to configure your gitter apitoken" From 6abd53ddf50738d52719bf52180a773b9e310764 Mon Sep 17 00:00:00 2001 From: rjpadilla Date: Sat, 27 Mar 2021 03:26:21 +0300 Subject: [PATCH 3/3] updated message.sh --- modules/message.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/message.sh b/modules/message.sh index d73cf2540e..4a854f4d12 100644 --- a/modules/message.sh +++ b/modules/message.sh @@ -236,7 +236,7 @@ function message { get_apitoken gitter echo echo "You have successfully configured your Gitter apitoken." - echo "Now you must provide a subcommand for $BASENAME message gitter listed below:" + echo "Now you must provide a subcommand for $BASENAME message gitter [channels|send|show|read|mark] listed below:" echo echo " $BASENAME message gitter channels" echo " check for channels" @@ -254,9 +254,7 @@ function message { echo " Marks unread messages from a gitter channel to read" echo else - echo "You do not have a gitter apitoken setup." - echo "For instructions to configure your gitter apitoken" - echo "Please run: $BASENAME message gitter apitoken" + ./$BASENAME message gitter apitoken fi ;; *)