Merge remote-tracking branch 'refs/remotes/topkecleon/master'

This commit is contained in:
EyeZiS 2016-09-04 21:00:44 +02:00
commit ace1464f54
3 changed files with 11 additions and 6 deletions

View File

@ -58,7 +58,7 @@ This section includes an exhaustive list of possible configuration values for ot
| `log_chat` | nil | Telegram ID of the recipient for error messages. | | `log_chat` | nil | Telegram ID of the recipient for error messages. |
| `cmd_pat` | `"/"` | Character (or string) to be used for bot commands. | | `cmd_pat` | `"/"` | Character (or string) to be used for bot commands. |
| `lang` | `"en"` | Two-letter ISO 639-1 language code. | | `lang` | `"en"` | Two-letter ISO 639-1 language code. |
| `about_text` | ... | Informational text to be returned by /about. | | `about_text` | ... | Informational text to be returned by /about. |
#### Error messages #### Error messages
These are the generic error messages used by most plugins. These belong in a table named `errors`. These are the generic error messages used by most plugins. These belong in a table named `errors`.

View File

@ -4,16 +4,18 @@
#!/bin/sh #!/bin/sh
echo "This script is intended for Ubuntu 16.04 and later. It will not work in 14.04 or earlier." echo "This script is intended for Ubuntu 16.04 and later. It will not work in"
echo "14.04 or earlier."
echo "This script will request root privileges to install the following packages:" 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 "lua5.3 liblua5.3-dev git libssl-dev fortune-mod fortunes unzip"
echo "It will also request root privileges to install Luarocks to to /usr/local/ along with the following rocks:" echo "It will also request root privileges to install Luarocks to to /usr/local/"
echo "along with the following rocks:"
echo "luasocket luasec multipart-post lpeg dkjson" echo "luasocket luasec multipart-post lpeg dkjson"
echo "Press enter to continue. Use Ctrl-C to exit." echo "Press enter to continue. Use Ctrl-C to exit."
read read
sudo apt-get update sudo apt-get update
sudo apt-get install -y lua5.3 liblua5.3-dev git libssl-dev fortune-mod fortunes sudo apt-get install -y lua5.3 liblua5.3-dev git libssl-dev fortune-mod fortunes unzip
git clone http://github.com/keplerproject/luarocks git clone http://github.com/keplerproject/luarocks
cd luarocks cd luarocks
./configure --lua-version=5.3 --versioned-rocks-dir --lua-suffix=5.3 ./configure --lua-version=5.3 --versioned-rocks-dir --lua-suffix=5.3
@ -24,6 +26,7 @@ sudo luarocks-5.3 install luasec
sudo luarocks-5.3 install multipart-post sudo luarocks-5.3 install multipart-post
sudo luarocks-5.3 install lpeg sudo luarocks-5.3 install lpeg
sudo luarocks-5.3 install dkjson sudo luarocks-5.3 install dkjson
sudo -k
cd .. cd ..
echo "Finished. Use ./launch to start otouto." echo "Finished. Use ./launch to start otouto."

View File

@ -2,7 +2,8 @@
#!/bin/sh #!/bin/sh
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." echo "This script is intended for Ubuntu 16.04 and later. It will probably work on"
echo "14.04 or 12.04 as well as Debian, but this is not guaranteed."
echo "This script will request root privileges to install the following packages:" echo "This script will request root privileges to install the following packages:"
echo "git libreadline-dev libssl-dev libevent-dev make" echo "git libreadline-dev libssl-dev libevent-dev make"
echo "Press enter to continue. Use Ctrl-C to exit." echo "Press enter to continue. Use Ctrl-C to exit."
@ -10,6 +11,7 @@ read
sudo apt-get update sudo apt-get update
sudo apt-get install -y git libreadline-dev libssl-dev libevent-dev make sudo apt-get install -y git libreadline-dev libssl-dev libevent-dev make
sudo -k
git clone http://github.com/vysheng/tg --recursive -b test git clone http://github.com/vysheng/tg --recursive -b test
cd tg cd tg
./configure --disable-libconfig --disable-liblua --disable-json ./configure --disable-libconfig --disable-liblua --disable-json