From 8ad9b2aa7880826421e703c050d275194de27de1 Mon Sep 17 00:00:00 2001 From: topkecleon Date: Sun, 4 Sep 2016 14:49:43 -0400 Subject: [PATCH] final script changes --- README.md | 2 +- install-dependencies.sh | 11 +++++++---- tg-install.sh | 4 +++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3067d48..29af4a6 100644 --- a/README.md +++ b/README.md @@ -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. | | `cmd_pat` | `"/"` | Character (or string) to be used for bot commands. | | `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 These are the generic error messages used by most plugins. These belong in a table named `errors`. diff --git a/install-dependencies.sh b/install-dependencies.sh index a8d4e50..4c6924d 100755 --- a/install-dependencies.sh +++ b/install-dependencies.sh @@ -4,16 +4,18 @@ #!/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 "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 "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/" +echo "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 +sudo apt-get install -y lua5.3 liblua5.3-dev git libssl-dev fortune-mod fortunes unzip git clone http://github.com/keplerproject/luarocks cd luarocks ./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 lpeg sudo luarocks-5.3 install dkjson +sudo -k cd .. echo "Finished. Use ./launch to start otouto." diff --git a/tg-install.sh b/tg-install.sh index c53c328..1b6ea6c 100755 --- a/tg-install.sh +++ b/tg-install.sh @@ -2,7 +2,8 @@ #!/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 "git libreadline-dev libssl-dev libevent-dev make" echo "Press enter to continue. Use Ctrl-C to exit." @@ -10,6 +11,7 @@ read sudo apt-get update 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 cd tg ./configure --disable-libconfig --disable-liblua --disable-json