improved scripts, updated readme

README.md

@@ -3,7 +3,7 @@ The plugin-wielding, multipurpose Telegram bot.
 
 [Public Bot](http://telegram.me/mokubot) | [Official Channel](http://telegram.me/otouto) | [Bot Development Group](http://telegram.me/BotDevelopment)
 
-otouto is a plugin-based, IRC-style bot written for the [Telegram Bot API](http://core.telegram.org/bots/api). Originally written in February of 2015 as a set of Lua scripts to run on [telegram-cli](http://github.com/vysheng/tg), otouto was open-sourced and migrated to the bot API later in June that year.
+otouto is a plugin-based, IRC-style bot written in Lua for the [Telegram Bot API](http://core.telegram.org/bots/api).
 
 otouto (including all plugins and documentation) is free software; you are free to redistribute it and/or modify it under the terms of the GNU Affero General Public License, version 3. See **LICENSE** for details.
 
@@ -18,18 +18,31 @@ otouto (including all plugins and documentation) is free software; you are free
 | [List of plugins](#list-of-plugins)           | [Contributors](#contributors) |
 
 ## Setup
-You _must_ have Lua 5.3, luasocket, luasec, multipart-post, and dkjson installed. You should also have lpeg, though it is not required. It is recommended you install these with LuaRocks.
+To get your bot running as soon as possible, see [Quick start](#quick-start).
+
+otouto uses Lua 5.3 and the following Lua libraries: luasocket, luasec, multipart-post, dkjson, and lpeg. It is recommended you install these with Luarocks. This can be done easily on Ubuntu 16.04 and later with the `install-dependencies.sh` script.
 
 To get started, clone the repository and set the following values in `config.lua`:
 
- - `bot_api_key` as your bot authorization token from the BotFather.
+ - `bot_api_key` as your bot authentication token from the BotFather.
  - `admin` as your Telegram ID.
 
-Some plugins are not enabled by default. If you wish to enable them, add them to the `plugins` array.
+Some plugins are not enabled by default. If you wish to enable them, add their names (sans file extension) to the `plugins` table in the configuration file.
 
-When you are ready to start the bot, run `./launch.sh`. To stop the bot, send "/halt" through Telegram. If you terminate the bot manually, you risk data loss. If you do you not want the bot to restart automatically, run it with `lua main.lua`.
+When you are ready to start the bot, run the `launch.sh` script. This script will automatically restart the bot five seconds after being stopped. If this behavior is undesired, start the bot manually with `lua5.3 main.lua`.
 
-Note that certain plugins, such as translate.lua and greetings.lua, will require privacy mode to be disabled. Additionally, some plugins may require or make use of various API keys. See [Configuration](#configuration) for details.
+To stop the bot, send "/halt" through Telegram. You can exit with Ctrl-C (or two Ctrl-C if using `launch.sh`), but this is not recommended as it risks data loss.
+
+Note that certain plugins, such as `translate.lua` and `greetings.lua`, will require privacy mode to be disabled. Additionally, some plugins may require or make use of various API keys and/or other configuration values not set by default. See [Configuration](#configuration) for details.
+
+### Quick start
+1. Clone the repository.
+`git clone http://otou.to/code otouto`
+2. Install dependencies: Lua 5.3, and the following Lua libs: luasocket, luasec, multipart-post, dkjson, and lpeg.†
+3. Add your bot token and Telegram ID to `config.lua`.
+4. Start the bot with `./launch.sh`.
+
+**†** On Ubuntu 16.04, this can be done easily with the `install-dependencies.sh` script.
 
 ## Configuration
 otouto is configured in the `config.lua` file. It is the single point of configuration for the bot, and contains any necessary user-specific variables, such as API keys, custom error messages, and enabled plugins.
@@ -58,7 +71,7 @@ These are the generic error messages used by most plugins. These belong in a tab
 | `argument`   | `"Invalid argument."`             |
 | `syntax`     | `"Invalid syntax."`               |
 
-#### Plugins
+#### Plugins table
 This table is an array of the names of enabled plugins. To enable a plugin, add its name to the list.
 
 ### Plugin configuration values
@@ -120,9 +133,9 @@ Some plugins are designed to be used by the bot's owner. Here are some examples,
 ## Group Administration
 The administration plugin enables self-hosted, single-realm group administration, supporting both normal groups and supergroups whch are owned by the bot owner. This works by sending TCP commands to an instance of tg running on the owner's account.
 
-To get started, run `./tg-install.sh`. Note that this script is written for Ubuntu/Debian. If you're running Arch (the only acceptable alternative), you'll have to do it yourself. If that is the case, note that otouto uses the "test" branch of tg, and the AUR package `telegram-cli-git` will not be sufficient, as it does not have support for supergroups yet.
+To get started, compile the `test` branch of [tg-cli](http://github.com/vysheng/tg). On Ubuntu and Debian, this can be done easily with the `tg-install.sh` script.
 
-Once the installation is finished, enable the `administration` plugin in your config file. You may have reason to change the default TCP port (4567); if that is the case, remember to change it in `tg-launch.sh` as well. Run `./tg-launch.sh` in a separate screen/tmux window. You'll have to enter your phone number and go through the login process the first time. The script is set to restart tg after two seconds, so you'll need to Ctrl+C after exiting.
+Once the compilation is finished, enable the `administration` plugin in your config file. You may have reason to change the default TCP port (4567); if that is the case, remember to change it in `tg-launch.sh` as well. Run `./tg-launch.sh` in a separate screen/tmux window. You'll have to enter your phone number and go through the login process the first time. The script is set to restart tg after two seconds, so you'll need to Ctrl+C after exiting.
 
 While tg is running, you may start/reload otouto with `administration.lua` enabled, and have access to a wide variety of administrative commands and automata. The administration "database" is stored in `administration.json`. To start using otouto to administrate a group (note that you must be the owner (or an administrator)), send `/gadd` to that group. For a list of commands, use `/ahelp`. Below I'll describe various functions now available to you.
 

install-dependencies.sh

@@ -1,10 +1,17 @@
 # This script will attempt to install Lua 5.3, Luarocks (pointed at 5.3), and
 # the rocks necssary to run otouto. This script targets Ubuntu 16.04; it will
-# probably not work on any earlier version of Ubuntu.
+# probably not work on earlier versions of Ubuntu.
 
 #!/bin/sh
-echo 'Requesting root privileges to install necessary packages:'
+
-echo 'lua5.3 liblua5.3-dev git libssl-dev fortune-mod fortunes'
+echo "This script is intended for Ubuntu 16.04 and later. It will not work in 14.04 or earlier."
+echo "This script will request root privileges to install the following packages:"
+echo "lua5.3 liblua5.3-dev git libssl-dev fortune-mod fortunes"
+echo "It will also request root privileges to install Luarocks to to /usr/local/ along with the following rocks:"
+echo "luasocket luasec multipart-post lpeg dkjson"
+echo "Press enter to continue. Use Ctrl-C to exit."
+read
+
 sudo apt-get update
 sudo apt-get install -y lua5.3 liblua5.3-dev git libssl-dev fortune-mod fortunes
 git clone http://github.com/keplerproject/luarocks
@@ -18,5 +25,6 @@ sudo luarocks-5.3 install multipart-post
 sudo luarocks-5.3 install lpeg
 sudo luarocks-5.3 install dkjson
 cd ..
-echo 'Finished. Use ./launch to start otouto.'
+
-echo 'Be sure to set your bot token in config.lua.'
+echo "Finished. Use ./launch to start otouto."
+echo "Be sure to set your bot token in config.lua."

launch.sh

@@ -1,13 +1,16 @@
+# Launch otouto, after checking for Lua 5.3.
+# Restart otouto five seconds after halted.
+
 #!/bin/sh
 
 # Ubuntu 16.04 seems to not link "lua" to lua5.3.
 if type lua5.3 >/dev/null 2>/dev/null; then
     while true; do
         lua5.3 main.lua
-        echo 'otouto has stopped. ^C to exit.'
+        echo "otouto has stopped. ^C to exit."
         sleep 5s
     done
 else
-    echo 'Lua 5.3 was not found.'
+    echo "Lua 5.3 was not found."
-    exit
+    echo "If you're on Ubuntu 16.04+, try running ./install-dependencies.sh."
 fi

tg-install.sh

@@ -1,16 +1,20 @@
+# Installs necessary dependencies for, and compiles, tg ("test" branch).
+
 #!/bin/sh
 
-# Will download lua-tg and will download and build tg's "test" branch.
+echo "This script is intended for Ubuntu 16.04 and later. It will probably work on 14.04 or 12.04 as well as Debian, but this is not guaranteed."
-# Written for Ubuntu/Debian. If you're running Arch (the only acceptable
+echo "This script will request root privileges to install the following packages:"
-# alternative), figure it out yourself.
+echo "git libreadline-dev libssl-dev libevent-dev make"
+echo "Press enter to continue. Use Ctrl-C to exit."
+read
 
-echo 'Requesting root privileges to install necessary packages:'
-echo 'git libreadline-dev libssl-dev libevent-dev make'
 sudo apt-get update
 sudo apt-get install -y git libreadline-dev libssl-dev libevent-dev make
 git clone http://github.com/vysheng/tg --recursive -b test
 cd tg
 ./configure --disable-libconfig --disable-liblua --disable-json
 make
+cd ..
+
 echo 'All done! Use ./tg-launch.sh to launch tg.'
 echo 'Be sure to log in with your Telegram account.'

tg-launch.sh

@@ -1,11 +1,16 @@
-#!/bin/sh
-
 # Launch tg listening on the default port (change this if you've changed it in
 # config.lua), delete state file after stop, wait five seconds, and restart.
 
-while true; do
+#!/bin/sh
+
+if [ -d tg ]; then
+    while true; do
         tg/bin/telegram-cli -P 4567 -E
         [ -f ~/.telegram-cli/state ] && rm ~/.telegram-cli/state
-    echo 'tg has stopped. ^C to exit.'
+        echo "tg has stopped. ^C to exit."
         sleep 5s
-done
+    done
+else
+    echo "tg not installed."
+    echo "If you're on Ubuntu, try running ./tg-install.sh."
+fi