From a0307c84b38134ee88cc2eaca12d5954a31eaa5f Mon Sep 17 00:00:00 2001
From: Akamaru <akamaru92@live.de>
Date: Mon, 7 Sep 2015 18:11:32 +0200
Subject: [PATCH] merge upstream

---
 bot/utils.lua |  2 +-
 launch.sh     | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/bot/utils.lua b/bot/utils.lua
index 06ab32c..2e032a7 100644
--- a/bot/utils.lua
+++ b/bot/utils.lua
@@ -250,7 +250,7 @@ function _send_photo(receiver, file_path, cb_function, cb_extra)
     cb_extra = cb_extra
   }
   -- 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
 
 -- Download the image and send to receiver, it will be deleted.
diff --git a/launch.sh b/launch.sh
index e71f79f..040bbdc 100755
--- a/launch.sh
+++ b/launch.sh
@@ -67,14 +67,26 @@ install_rocks() {
   RET=$?; if [ $RET -ne 0 ];
     then echo "Error. Exiting."; exit $RET;
   fi
+  
+  ./.luarocks/bin/luarocks install serpent
+  RET=$?; if [ $RET -ne 0 ];
+    then echo "Error. Exiting."; exit $RET;
+  fi
 }
 
 install() {
   git pull
   git submodule update --init --recursive
   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
   cd ..
   install_luarocks