Akamaru/Mikubot
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge upstream

Browse Source
This commit is contained in:
Akamaru 2015-09-07 18:11:32 +02:00
parent 510184e398
commit a0307c84b3
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bot/utils.lua
View File

@ -250,7 +250,7 @@ function _send_photo(receiver, file_path, cb_function, cb_extra)
cb_extra = cb_extra cb_extra = cb_extra
} }
-- Call to remove with optional callback -- Call to remove with optional callback
send_photo(receiver, file_path, rmtmp_cb, cb_extra) send_photo(receiver, file_path, cb_function, cb_extra)
end end
-- Download the image and send to receiver, it will be deleted. -- Download the image and send to receiver, it will be deleted.

16
launch.sh
View File

@ -67,14 +67,26 @@ install_rocks() {
RET=$?; if [ $RET -ne 0 ]; RET=$?; if [ $RET -ne 0 ];
then echo "Error. Exiting."; exit $RET; then echo "Error. Exiting."; exit $RET;
fi fi
./.luarocks/bin/luarocks install serpent
RET=$?; if [ $RET -ne 0 ];
then echo "Error. Exiting."; exit $RET;
fi
} }
install() { install() {
git pull git pull
git submodule update --init --recursive git submodule update --init --recursive
cd tg && ./configure && make cd tg && ./configure && make
RET=$?; if [ $RET -ne 0 ];
then echo "Error. Exiting."; exit $RET; RET=$?; if [ $RET -ne 0 ]; then
echo "Trying without Python...";
./configure --disable-python && make
RET=$?
fi
if [ $RET -ne 0 ]; then
echo "Error. Exiting."; exit $RET;
fi fi
cd .. cd ..
install_luarocks install_luarocks