streamline autorunonce (fixes #481) (#480)

Author: vers4ce

autorunonce

@@ -1,39 +1,63 @@
 #!/bin/bash
 
+#Local variables
+configtor="false"
+configdocker="true"
+updateplanet="false"
+
 treehouses rename treehouses
 treehouses expandfs
 treehouses button bluetooth
 
+#Uncomment the appropriate line for your connection
+
 #treehouses wifi <wifiname> [password]
 #treehouses ap internet <hotspotname> [password]
 treehouses ap internet treehouses
 #treehouses ap local <hotspotname> [password]
 #treehouses bridge <wifiname> <hotspotname> [wifipassword] [hotspotpassword]
 
-#have internet and wanna latest planet? - please uncomment
-#docker pull treehouses/planet:latest
-#docker pull treehouses/planet:db-init
-#docker tag treehouses/planet:latest treehouses/planet:local
-#docker tag treehouses/planet:db-init treehouses/planet:db-init-local
+# Start tor service
+if [ $configtor = "true" ]; then
+	treehouses tor add 22
+	sleep 10
+	sync
+	treehouses tor start
+	treehouses tor notice on
+	sync
+	sleep 10
+fi
 
-{
-  echo "#!/bin/sh"
-  echo
-  echo "sleep 1"
-  echo
-  echo "if [ -f /srv/planet/pwd/credentials.yml ]; then"
-  echo "  docker-compose -f /srv/planet/planet.yml -f /srv/planet/volumes.yml -f /srv/planet/pwd/credentials.yml -p planet up -d"
-  echo "else"
-  echo "  docker-compose -f /srv/planet/planet.yml -f /srv/planet/volumes.yml -p planet up -d"
-  echo "fi"
-} > /boot/autorun
+# Update planet if there is an internet connection
+if [ $updateplanet = "true" ]; then
+	docker pull treehouses/planet:latest
+	docker pull treehouses/planet:db-init
+	docker tag treehouses/planet:latest treehouses/planet:local
+	docker tag treehouses/planet:db-init treehouses/planet:db-init-local
+fi
 
-mv /srv/tenalp /srv/planet
+# Starts docker container
+if [ $configdocker = "true" ]; then
+	{	
+	echo "#!/bin/sh"
+	echo
+	echo "sleep 1"
+	echo
+	echo "if [ -f /srv/planet/pwd/credentials.yml ]; then"
+	echo "  docker-compose -f /srv/planet/planet.yml -f /srv/planet/volumes.yml -f /srv/planet/pwd/credentials.yml -p planet up -d"
+	echo "else"
+	echo "  docker-compose -f /srv/planet/planet.yml -f /srv/planet/volumes.yml -p planet up -d"
+	echo "fi"
+	} > /boot/autorun
 
-sync;sync;sync
+	mv /srv/tenalp /srv/planet
 
-docker-compose -f /srv/planet/planet.yml -f /srv/planet/volumes.yml -p planet up -d
+	sync;sync;sync
+	
+	docker-compose -f /srv/planet/planet.yml -f /srv/planet/volumes.yml -p planet up -d
+fi
 
+# Reset if RPiZero or RPi3A
 case "$(treehouses detectrpi)" in
   RPIZW|RPI3A+)
     treehouses bootoption console