From a4dce7bb5a1e348647d0dbb402267ee74891a275 Mon Sep 17 00:00:00 2001 From: "Kay Marquardt (Gnadelwartz)" Date: Mon, 28 Dec 2020 12:29:38 +0100 Subject: [PATCH] myfilelocationstartshere -> myfilestartshere --- doc/3_advanced.md | 6 +++--- modules/sendMessage.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/3_advanced.md b/doc/3_advanced.md index ef1e8db..49a3ff8 100644 --- a/doc/3_advanced.md +++ b/doc/3_advanced.md @@ -114,7 +114,7 @@ echo "Text that will appear in chat? mykeyboardstartshere [ \"Yep, sure\" , \"No ``` Same goes for files: ```bash -echo "Text that will appear in chat? myfilelocationstartshere /home/user/dog.jpg" +echo "Text that will appear in chat? myfilestartshere /home/user/dog.jpg" ``` *Note*: Use an _absolute path name_ (starting with `/`), a relative path name is relative to `data-bot-bash/upload`! See [send_file documentation](6_reference.md#send_file) for more information. @@ -133,7 +133,7 @@ echo "Text that will appear in chat. mylatstartshere 45 mylongstartshere 45 myti ``` You can combine them: ```bash -echo "Text that will appear in chat? mykeyboardstartshere [ \"Yep, sure\" , \"No, highly unlikely\" ] myfilelocationstartshere /home/user/doge.jpg mylatstartshere 45 mylongstartshere 45" +echo "Text that will appear in chat? mykeyboardstartshere [ \"Yep, sure\" , \"No, highly unlikely\" ] myfilestartshere /home/user/doge.jpg mylatstartshere 45 mylongstartshere 45" ``` Please note that you can either send a location or a venue, not both. To send a venue add the mytitlestartshere and the myaddressstartshere keywords. @@ -302,5 +302,5 @@ Note: If you disable automatic retry, se above, you disable also connection prob #### [Prev Getting started](2_usage.md) #### [Next Expert Use](4_expert.md) -#### $$VERSION$$ v1.21-dev-2-gde31231 +#### $$VERSION$$ v1.21-dev-19-gb5e4f53 diff --git a/modules/sendMessage.sh b/modules/sendMessage.sh index 9bd8dec..c1ab3f6 100644 --- a/modules/sendMessage.sh +++ b/modules/sendMessage.sh @@ -6,7 +6,7 @@ # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # # shellcheck disable=SC1117 -#### $$VERSION$$ v1.20-0-g2ab00a2 +#### $$VERSION$$ v1.21-dev-19-gb5e4f53 # will be automatically sourced from bashbot @@ -286,7 +286,7 @@ send_message() { keyboard="$(sed <<< "${2}" '/mykeyboardstartshere /!d;s/.*mykeyboardstartshere *//;s/ *my[nkfltab][a-z]\{2,13\}startshere.*//;s/ *mykeyboardendshere.*//')" btext="$(sed <<< "${2}" '/mybtextstartshere /!d;s/.*mybtextstartshere //;s/ *my[nkfltab][a-z]\{2,13\}startshere.*//;s/ *mykeyboardendshere.*//')" burl="$(sed <<< "${2}" '/myburlstartshere /!d;s/.*myburlstartshere //;s/ *my[nkfltab][a-z]\{2,13\}startshere.*//g;s/ *mykeyboardendshere.*//g')" - file="$(sed <<< "${2}" '/myfilelocationstartshere /!d;s/.*myfilelocationstartshere //;s/ *my[nkfltab][a-z]\{2,13\}startshere.*//;s/ *mykeyboardendshere.*//')" + file="$(sed <<< "${2}" '/myfile[^s]*startshere /!d;s/.*myfile[^s]*startshere //;s/ *my[nkfltab][a-z]\{2,13\}startshere.*//;s/ *mykeyboardendshere.*//')" lat="$(sed <<< "${2}" '/mylatstartshere /!d;s/.*mylatstartshere //;s/ *my[nkfltab][a-z]\{2,13\}startshere.*//;s/ *mykeyboardendshere.*//')" long="$(sed <<< "${2}" '/mylongstartshere /!d;s/.*mylongstartshere //;s/ *my[nkfltab][a-z]\{2,13\}startshere.*//;s/ *mykeyboardendshere.*//')" title="$(sed <<< "${2}" '/mytitlestartshere /!d;s/.*mytitlestartshere //;s/ *my[kfltab][a-z]\{2,13\}startshere.*//;s/ *mykeyboardendshere.*//')"