tarina

commit 96f8c50ebb062f94c2257e5385149a49af63a53e
parent 4f2e0e8123e9da8fbaac077602a4320b689d2025
Author: rbckman <robinbackman@gmail.com>
Date:   Thu,  9 Mar 2017 09:37:41 +0000

backup script fix

Diffstat:
M
backup.sh
 | 
2
+-
M
tarina.py
 | 
5
+----

2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/backup.sh b/backup.sh
@@ -1 +1 @@
-rsync -uav /home/pi/tarina rob@lulzcam.org:/srv/www/tarina.org/public_html/src/
+rsync -uav /home/pi/tarina rob@tarina.org:/srv/www/tarina.org/public_html/src/
diff --git a/tarina.py b/tarina.py
@@ -370,12 +370,9 @@ def update(tarinaversion, tarinavername):
         time.sleep(4)
         timeleft = 0
         while timeleft < 5:
-            writemessage('Updating in ' + str(5 - timeleft) + ' seconds. Press middlebutton to cancel')
+            writemessage('Updating in ' + str(5 - timeleft) + ' seconds.')
             time.sleep(1)
             timeleft = timeleft + 1
-            middlebutton = GPIO.input(5)
-            if middlebutton == False:
-                return tarinaversion, tarinavername
         writemessage('Updating...')
         os.system('git pull')
         writemessage('Hold on rebooting Tarina...')