Merge branch 'master' of https://tree.clementinecomputing.com/clementinecomputing/popufare

aux/deploy-busunit-interactive

@@ -123,7 +123,7 @@ read adddeps
 
 if [[ "$adddeps" =~ ^[yY]?$ ]]; then
 
-  deps="espeak mplayer git ppp ppp-dev sox alsa-utils unclutter fbi xinput-calibrator ffmpeg jq"
+  deps="espeak mplayer git ppp ppp-dev sox alsa-utils unclutter fbi xinput-calibrator ffmpeg jq matchbox-window-manager "
 
   echo ""
   echo "  Installing: $deps"
@@ -141,13 +141,15 @@ if [[ "$adddeps" =~ ^[yY]?$ ]]; then
     remdeps="libreoffice libreoffice-base-core libreoffice-common \
       libreoffice-core libreoffice-help-common libreoffice-help-en-gb \
       libreoffice-help-en-us libreoffice-l10n-en-gb \
-      libreoffice-style-colibre libreoffice-style-tango"
+      libreoffice-style-colibre libreoffice-style-tango \
+      wolfram-engine scratch scratch2"
 
     echo ""
     echo "  Removing: $remdeps"
 
-    sudo apt-get remove -y $remdeps
-    sudo apt-get autoremove -y --purge
+    #sudo apt-get remove -y $remdeps
+    #sudo apt-get autoremove -y --purge
+    apt-get purge -y $remdeps
 
     echo ""
 
@@ -235,6 +237,7 @@ sudo bash -c " cd /home/bus/bin ; cp -fRL $bd/scripts/unpack_server_data.sh . "
 
 sudo bash -c " cd /home/bus/bin ; cp -fRL $bd/scripts/say . "
 sudo bash -c " cd /home/bus/bin ; cp -fRL $bd/scripts/volumeset . "
+sudo bash -c " cd /home/bus/bin ; cp -fRL $bd/scripts/start-kiosk.sh . "
 
 sudo bash -c " cd /home/bus/config ; cp -fRL $diudir/html . ; "
 sudo bash -c " cd /home/bus/config ; cp $bd/passdb/init.scm . ; cp $bd/passdb/rfid_patterns.txt . ; cp $bd/avls/avls_freq.txt . "

busunit/rootfs/etc/rc.local

@@ -20,23 +20,28 @@
 # along with PopuFare.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-/home/bus/bin/setup-serial.py 2>&1 >> /tmp/init.log
+/home/bus/bin/setup-serial.py >> /tmp/init.log 2>&1
 sleep 2
-/home/bus/bin/get_net_ids.sh 2>&1 >> /tmp/init.log
+/home/bus/bin/get_net_ids.sh >> /tmp/init.log 2>&1
 sleep 2
 
 ip link set eth0 down
 
-/home/bus/bin/connection_tether.sh 2>&1 >> /tmp/tether.log &
+/home/bus/bin/connection_tether.sh >> /tmp/tether.log 2>&1 &
 sleep 2
-/home/bus/bin/update_loop.sh 2>&1 >> /tmp/run.log &
+/home/bus/bin/update_loop.sh >> /tmp/run.log 2>&1 &
 sleep 2
 
-/home/bus/bin/reset-gps 2>&1 >> /tmp/gps.log &
+/home/bus/bin/reset-gps >> /tmp/gps.log 2>&1 &
 sleep 2
 
 ## If using HDMI sound, uncomment the following two lines...
-vcgencmd force_audio hdmi 1 2>&1 >> /tmp/audio.log &
+##
+vcgencmd force_audio hdmi 1 >> /tmp/audio.log 2>&1 &
 sleep 1
 
+#xinit /home/bus/bin/start-kiosk.sh >> /tmp/kiosk.log 2>&1 &
+#su -l pi -c /usr/bin/startx /home/bus/bin/start-kiosk.sh >> /tmp/kiosk.log 2>&1 &
+( sleep 5 && usr/bin/startx /home/bus/bin/start-kiosk.sh >> /tmp/kiosk.log 2>&1 ) &
+
 exit 0