diff --git a/README.html b/README.html index e5d8ee0..260cc8c 100644 --- a/README.html +++ b/README.html @@ -269,6 +269,6 @@ It features background tasks and interactive chats, and can serve as an interfac

@Gnadelwartz

That's it!

If you feel that there's something missing or if you found a bug, feel free to submit a pull request!

-

$$VERSION$$ v1.0-0-g99217c4

+

$$VERSION$$ v1.0-18-g9b3d689

diff --git a/README.md b/README.md index e790ab2..25ba00e 100644 --- a/README.md +++ b/README.md @@ -261,4 +261,4 @@ bashbotBlockRecover() { If you feel that there's something missing or if you found a bug, feel free to submit a pull request! -#### $$VERSION$$ v1.0-0-g99217c4 +#### $$VERSION$$ v1.0-18-g9b3d689 diff --git a/README.txt b/README.txt index 69f810c..2310ffa 100644 --- a/README.txt +++ b/README.txt @@ -351,4 +351,4 @@ wait If you feel that there's something missing or if you found a bug, feel free to submit a pull request! -#### $$VERSION$$ v1.0-0-g99217c4 +#### $$VERSION$$ v1.0-18-g9b3d689 diff --git a/bashbot.sh b/bashbot.sh index b7d3c35..a6fc42f 100755 --- a/bashbot.sh +++ b/bashbot.sh @@ -11,7 +11,7 @@ # This file is public domain in the USA and all free countries. # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # -#### $$VERSION$$ v1.1-dev-1-gd8c10ef +#### $$VERSION$$ v1.0-18-g9b3d689 # # Exit Codes: # - 0 success (hopefully) diff --git a/commands.sh b/commands.sh index fcb1fae..90d84c8 100644 --- a/commands.sh +++ b/commands.sh @@ -15,7 +15,7 @@ # This file is public domain in the USA and all free countries. # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # -#### $$VERSION$$ v1.0-0-g99217c4 +#### $$VERSION$$ v1.0-18-g9b3d689 # # adjust your language setting here, e.g. when run from other user or cron. diff --git a/dev/all-tests.sh b/dev/all-tests.sh index 5193203..51999a1 100755 --- a/dev/all-tests.sh +++ b/dev/all-tests.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # this has to run once atfer git clone # and every time we create new hooks -#### $$VERSION$$ v1.0-0-g99217c4 +#### $$VERSION$$ v1.0-18-g9b3d689 # magic to ensure that we're always inside the root of our application, # no matter from which directory we'll run script diff --git a/dev/hooks/pre-commit.sh b/dev/hooks/pre-commit.sh index 6ce51cc..64650d5 100755 --- a/dev/hooks/pre-commit.sh +++ b/dev/hooks/pre-commit.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v1.0-0-g99217c4 +#### $$VERSION$$ v1.0-18-g9b3d689 ############ # NOTE: you MUST run install-hooks.sh again when updating this file! diff --git a/doc/0_install.md b/doc/0_install.md index 7ef2e4c..1556329 100644 --- a/doc/0_install.md +++ b/doc/0_install.md @@ -15,17 +15,6 @@ Now your Bot is ready to start ... **If you are new to Bot development read [Bots: An introduction for developers](https://core.telegram.org/bots)** -### Install from github - -As an alternative to download the zip files, you can clone the github repository to get the latest improvements/fixes. - -1. Go to the directory you want to install bashbot, e.g. - * your $HOME directory (install and run with your user-ID) - * /usr/local if you want to run as service -2. Run ```git clone https://github.com/topkecleon/telegram-bot-bash.git``` -3. Change into the directory ```telegram-bot-bash``` -4. Run ``` dev/all-tests.sh``` and if everything finish OK ... -5. Run ```sudo ./bashbot.sh init``` to setup the environment and enter your Bots token given by botfather. ### Update bashbot @@ -43,6 +32,30 @@ If you modified ```commands.sh``` move your changes to ```mycommands.sh```, this Now you can restart your bashbot instances. + +### Install from github + +The first install can also be done from github, updates should always done from the zip or tar archive to avoid +overwriting your config and mycommands.sh files. + +1. Go to the directory you want to install bashbot, e.g. + * your $HOME directory (install and run with your user-ID) + * /usr/local if you want to run as service +2. Run ```git clone https://github.com/topkecleon/telegram-bot-bash.git``` +3. Change into the directory ```telegram-bot-bash``` +4. Run ``` dev/all-tests.sh``` and if everything finish OK ... +5. Run ```sudo ./bashbot.sh init``` to setup the environment and enter your Bots token given by botfather. + +### Get the latest development updates from github + +To update an existing installation to the latest development version from github you must create the update archives yourself. + +1. Run ```git clone https://github.com/topkecleon/telegram-bot-bash.git``` +2. Change into the directory ```telegram-bot-bash``` +3. Run ``` dev/make-distribution.sh``` +4. If no errors occcure you will find archive files in DISTRIBUTION + + ### Note for BSD and MacOS **On MacOS** you must install a more recent version of bash, as the default bash is way to old, @@ -131,5 +144,5 @@ The old format is supported for backward compatibility, but may fail for corner #### [Next Create Bot](1_firstbot.md) -#### $$VERSION$$ v1.0-0-g99217c4 +#### $$VERSION$$ v1.0-18-g9b3d689 diff --git a/doc/2_usage.md b/doc/2_usage.md index 816d0f2..2b7d6b7 100644 --- a/doc/2_usage.md +++ b/doc/2_usage.md @@ -283,5 +283,5 @@ send_action "${CHAT[ID]}" "action" #### [Prev Create Bot](1_firstbot.md) #### [Next Advanced Usage](3_advanced.md) -#### $$VERSION$$ v1.0-0-g99217c4 +#### $$VERSION$$ v1.0-18-g9b3d689 diff --git a/mycommands.sh b/mycommands.sh index 16b4ff6..09be684 100644 --- a/mycommands.sh +++ b/mycommands.sh @@ -8,7 +8,7 @@ # #### if you start to develop your own bot, use the clean version of this file: # #### mycommands.clean # -#### $$VERSION$$ v1.0-0-g99217c4 +#### $$VERSION$$ v1.0-18-g9b3d689 # # uncomment the following lines to overwrite info and help messages