various fixes to allow running main process by hand

Makefile

@@ -10,9 +10,8 @@ list:
 .PHONY: simulation # Run the vehicle and server containers in simulation mode. Use envvar ACORN_NAMES to set the name of each simulated vehicle.
 simulation: docker-image
 	@docker-compose -f docker-compose-server.yml up -d && \
-	export server_ip=`docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' acorn_server`; \
 	for name in $(ACORN_NAMES); do \
-		NAME=$${name} SERVER_IP=$${server_ip} envsubst < docker-compose-simulation.yml | COMPOSE_IGNORE_ORPHANS=true docker-compose --file /dev/stdin --project-directory . up -d; \
+		NAME=$${name} envsubst < docker-compose-simulation.yml | COMPOSE_IGNORE_ORPHANS=true docker-compose --file /dev/stdin --project-directory . up -d; \
 	done &&\
 	echo "Please visit http://localhost"
 
@@ -68,8 +67,8 @@ restart-docker-compose:
 
 .PHONY: docker-image
 docker-image: Dockerfile
-	@find Dockerfile -newermt "`docker images $(LOCAL_IMAGE) --format "{{.CreatedAt}}"`" || \
-	docker build -t $(LOCAL_IMAGE) .
+	image_time=`docker images $(LOCAL_IMAGE) --format "{{.CreatedAt}}"`; \
+	test -z `find Dockerfile -newermt "$${image_time}"` || docker build -t $(LOCAL_IMAGE) .
 
 Dockerfile: vehicle/requirements.txt server/requirements.txt
 	@docker build -t $(LOCAL_IMAGE) . && touch Dockerfile # Rebuilding image if requirements files have been changed

SIMULATION.md

@@ -97,11 +97,11 @@ docker container.
 
 Now run:
 ```
-python3 vehicle/master_process.py --sim
+vehicle/start_main.sh --sim
 ```
 or:
 ```
-python3 vehicle/master_process.py --sim --debug
+vehicle/start_main.sh --sim --debug
 ```
 When you are making changes to the vehicle code, often this is how you will want
 to run things. Instead of restarting the entire simulation environment, you can

vehicle/autolaunch_vehicle.sh

@@ -1,3 +1,5 @@
+#!/bin/sh
+
 echo $PWD
 echo Sleep 5...
 sleep 5

vehicle/autolaunch_vehicle_sim.sh

@@ -1,9 +1,9 @@
+#!/bin/sh
+
 echo $PWD
 echo Sleep 5...
 sleep 5
 echo Start Sessions...
-gateway_ip=`ip route show 0.0.0.0/0 | cut -d\  -f3`
-export SERVER_IP=${gateway_ip}
 tmux new-session -d -s "main" sh /home/pi/vehicle/start_main.sh --sim &
 tmux new-session -d -s "motors" sh /home/pi/vehicle/start_motors.sh --simulated_hardware &
 echo Started. Begin infinite loop.

vehicle/raspberry_pi_setup.sh

@@ -1,2 +1,4 @@
+#!/bin/sh
+
 sudo apt update
-sudo apt install libatlas-base-dev
+sudo apt install libatlas-base-dev

vehicle/start_main.sh

@@ -1,4 +1,7 @@
+#! /bin/sh
+
 source /home/pi/.bashrc
 PATH=/home/pi/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/games:/usr/games
 tmux  pipe-pane -o 'cat >>/home/pi/logs/tmux_output_$(date +"%Y_%m_%d_%I_%M_%p").#S:#I-#P'
-python3 /home/pi/vehicle/master_process.py $@
+gateway_ip=`ip route show 0.0.0.0/0 | cut -d\  -f3`
+SERVER_IP=${gateway_ip} python3 /home/pi/vehicle/master_process.py $@

vehicle/start_motors.sh

@@ -1,3 +1,5 @@
+#!/bin/sh
+
 source /home/pi/.bashrc
 PATH=/home/pi/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/games:/usr/games
 tmux  pipe-pane -o 'cat >>/home/pi/logs/tmux_output_$(date +"%Y_%m_%d_%I_%M_%p").#S:#I-#P'