tarina

commit 0d236343288c7938843dedd91df8692d89d0d690
parent 886a5e1852bd66ebac4fa635143ee649108c53b6
Author: rbckman <robinbackman@gmail.com>
Date:   Sat, 11 Aug 2018 21:47:48 +0300

tarina user to pi

Diffstat:
M
install.sh
 | 
3
+--
M
tarina.py
 | 
13
+++++++++++--

2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/install.sh b/install.sh
@@ -89,8 +89,7 @@ Conflicts=getty@tty1.service
 Type=simple
 RemainAfterExit=yes
 ExecStart=/usr/bin/python /home/pi/tarina/tarina.py
-User=root
-WorkingDirectory=/home/pi/tarina
+User=pi
 Restart=on-failure
 StandardInput=tty-force
 StandardOutput=inherit
diff --git a/tarina.py b/tarina.py
@@ -29,6 +29,11 @@ import RPi.GPIO as GPIO
 from PIL import Image
 import smbus
 
+# Get path of the current dir, then use it as working directory:
+rundir = os.path.dirname(__file__)
+if rundir != '':
+    os.chdir(rundir)
+
 bus = smbus.SMBus(3) # Rev 2 Pi uses 1
 DEVICE = 0x20 # Device address (A0-A2)
 IODIRB = 0x0d # Pin pullups B-side
@@ -1172,8 +1177,12 @@ def main():
         #call ([tarinafolder + '/fbcp &'], shell = True)
         call (['./startinterface.sh &'], shell = True)
 
-        #Start tarinaserver on port 80
-        call (['./srv/tarinaserver.py 80 &'], shell = True)
+        #Try to run tarinaserver on port 8080
+        try:
+            call (['./srv/tarinaserver.py 8080 &'], shell = True)
+        except:
+            writemessage("could not run tarina server")
+            time.sleep(2)
 
         #LOAD FILM AND SCENE SETTINGS
         try: