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

aux/deploy-busunit-interactive

@@ -118,6 +118,48 @@ echo ""
 ######
 ######
 
+echo -n "Install package dependencies? [Y/n]: "
+read adddeps
+
+if [[ "$adddeps" =~ ^[yY]?$ ]]; then
+
+  deps="espeak mplayer git"
+
+  echo ""
+  echo "  Installing: $deps"
+
+  sudo apt-get update
+  sudo apt-get install -y $deps
+
+  echo ""
+
+  echo -n "  Remove unused packages (free up space)? [Y/n]: "
+  read remunused
+
+  if [[ "$remunused" =~ ^[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"
+
+    echo ""
+    echo "  Removing: $remdeps"
+
+    sudo apt-get remove -y $remdeps
+    sudo apt-get autoremove -y --purge
+
+    echo ""
+
+  fi
+
+fi
+
+echo ""
+
+######
+######
+
 echo -n "Create 'bus' user? [Y/n]: "
 read createbususer
 
@@ -178,19 +220,22 @@ tc=/home/bus/popufare/busunit/testing/config
 sudo cp -R $repolocation /home/bus
 sudo chown -R bus:bus /home/bus/popufare
 sudo bash -c " su - bus -c ' cd /home/bus/popufare/busunit ; ./build_all.sh native ; ' "
-sudo bash -c " cd /home/bus/bin ; ln -sf $d/avls . ; ln -sf $d/billdb . ; ln -sf $d/client_supervisor . ; ln -sf $d/debug_client . ; ln -sf $d/diu_minder . ; ln -sf $d/ipc_server . "
-sudo bash -c " cd /home/bus/bin ; ln -sf $d/paddlemgr . ; ln -sf $d/passdb . ; ln -sf $d/piu_minder . ; ln -sf $d/send_billing_record . ; ln -sf $d/send_magstripe . "
-sudo bash -c " cd /home/bus/bin ; ln -sf $d/gps_minder . "
+sudo bash -c " cd /home/bus/bin ; cp -fRL $d/avls . ; cp -fRL $d/billdb . ; cp -fRL $d/client_supervisor . ; cp -fRL $d/debug_client . ; cp -fRL $d/diu_minder . ; cp -fRL $d/ipc_server . "
+sudo bash -c " cd /home/bus/bin ; cp -fRL $d/paddlemgr . ; cp -fRL $d/passdb . ; cp -fRL $d/piu_minder . ; cp -fRL $d/send_billing_record . ; cp -fRL $d/send_magstripe . "
+sudo bash -c " cd /home/bus/bin ; cp -fRL $d/gps_minder . "
+
+sudo bash -c " cd /home/bus/bin ; cp -fRL $bd/DIUv2/diu_kiosk . "
 
-sudo bash -c " cd /home/bus/bin ; ln -sf $bd/DIUv2/diu_kiosk . "
+sudo bash -c " cd /home/bus/bin ; cp -fRL $bd/scripts/init_bus.sh . ; cp -fRL $bd/scripts/update_loop.sh . ; cp -fRL $bd/scripts/setup-serial.py . ; cp -fRL $bd/scripts/get_net_ids.sh . "
+sudo bash -c " cd /home/bus/bin ; cp -fRL $bd/scripts/connection_tether.sh . ; cp -fRL $bd/scripts/reset-gps.py ./reset-gps "
 
-sudo bash -c " cd /home/bus/bin ; ln -sf $bd/scripts/init_bus.sh . ; ln -sf $bd/scripts/update_loop.sh . ; ln -sf $bd/scripts/setup-serial.py . ; ln -sf $bd/scripts/get_net_ids.sh . "
-sudo bash -c " cd /home/bus/bin ; ln -sf $bd/scripts/connection_tether.sh . ; ln -sf $bd/scripts/reset-gps.py ./reset-gps "
+sudo bash -c " cd /home/bus/bin ; cp -fRL $bd/scripts/apply_update.sh . ; cp -fRL $bd/scripts/apply_update_legacy.sh . ; cp -fRL $bd/scripts/apply_update_popufare.sh . "
+sudo bash -c " cd /home/bus/bin ; cp -fRL $bd/scripts/fix_pkg_perm.sh . "
 
-sudo bash -c " cd /home/bus/bin ; ln -sf $bd/scripts/apply_update.sh . ; ln -sf $bd/scripts/apply_update_legacy.sh . ; ln -sf $bd/scripts/apply_update_popufare.sh "
-sudo bash -c " cd /home/bus/bin ; ln -sf $bd/scripts/fix_pkg_perm.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/config ; ln -sf $diudir/html . ; "
+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 . "
 sudo bash -c " cd /home/bus/config ; cp $bd/passdb/init.scm . ; cp $bd/passdb/rfid_patterns.txt . ; cp $bd/avls/avls_freq.txt . "
 
@@ -361,6 +406,12 @@ echo -n "Setup FONA ppp files? [Y/n]: "
 read setupfona
 
 if [[ "$setupfona" =~ ^[yY]?$ ]] ; then
+
+  echo "  Creating /etc/ppp/peers/ and /etc/chatscripts/"
+
+  sudo mkdir -p /etc/ppp/peers/
+  sudo mkdir -p /etc/chatscripts/
+
   echo "  /home/bus/popufare/busunit/ppp-dialer/etc/ppp/peers/fona -> /etc/ppp/peers/gprs"
   echo "  /home/bus/popufare/busunit/ppp-dialer/etc/chatscripts/gprs -> /etc/chatscripts/gprs"
 
@@ -489,8 +540,8 @@ read setupkiosk
 
 if [[ "$setupkiosk" =~ ^[yY]?$ ]] ; then
 
-  echo "  /home/bus/popufare/busunit/scripts/kiosk.service -> /lib/systemd/system/kiosk.service"
-  sudo cp /home/bus/popufare/busunit/scripts/kiosk.service /lib/systemd/system/kiosk.service
+  echo "  /home/bus/popufare/busunit/rootfs/etc/systemd/system/kiosk.service -> /lib/systemd/system/kiosk.service"
+  sudo cp /home/bus/popufare/busunit/rootfs/etc/systemd/system/kiosk.service /lib/systemd/system/kiosk.service
 
   echo "  enabling kiosk.service ('systemctl enable kiosk.service')"
   sudo systemctl enable kiosk.service
@@ -520,8 +571,8 @@ if [[ "$setupstartup" =~ ^[yY]?$ ]] ; then
   sudo cp /etc/rc.local $tmpfn
   sudo mv $tmpfn /root/$bfn
 
-  echo "  /home/bus/popufare/busunit/scripts/rc.local -> /etc/rc.local"
-  sudo cp /home/bus/popufare/busunit/scripts/rc.local /etc/rc.local
+  echo "  /home/bus/popufare/busunit/rootfs/etc/rc.local -> /etc/rc.local"
+  sudo cp /home/bus/popufare/busunit/rootfs/etc/rc.local /etc/rc.local
 
 fi