make autostart configurable

RPi-Distro · Dec 26, 2020 · 60dcb9a · 60dcb9a
1 parent cb72495
commit 60dcb9a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 1 deletion.
diff --git a/stage3/06-install-jamulus/01-run.sh b/stage3/06-install-jamulus/01-run.sh
@@ -10,6 +10,9 @@ cp files/Desktop/*.desktop ${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop/
 cp files/jamulus_start.sh ${ROOTFS_DIR}/usr/local/bin/
 chmod +x ${ROOTFS_DIR}/usr/local/bin/jamulus_start.sh
 
+cp files/jambox_start.sh ${ROOTFS_DIR}/usr/local/bin/
+chmod +x ${ROOTFS_DIR}/usr/local/bin/jambox_start.sh
+
 mkdir -p ${ROOTFS_DIR}/boot/payload/home/${FIRST_USER_NAME}/.config/Jamulus
 mkdir -p ${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config/Jamulus
 

diff --git a/stage3/06-install-jamulus/files/autostart b/stage3/06-install-jamulus/files/autostart
@@ -1,4 +1,4 @@
 @lxpanel --profile LXDE-pi
 @pcmanfm --desktop --profile LXDE-pi
 @xscreensaver -no-splash
-@lxterminal -e /usr/local/bin/jamulus_start.sh
+@lxterminal -e /usr/local/bin/jambox_start.sh
diff --git a/stage3/06-install-jamulus/files/jambox-start.sh b/stage3/06-install-jamulus/files/jambox-start.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+if [ -f ~/.config/Jamulus/jamulus_start.conf ]; then
+  source ~/.config/Jamulus/jamulus_start.conf
+  if [[ "$JAMULUS_AUTOSTART" == '1' ]]; then
+   jamulus_start.sh
+   exit 0
+  fi
+fi
+
+if [ -f ~/.config/sonobus_start.conf ]; then
+  source ~/.config/sonobus_start.conf
+  if [[ "$SONOBUS_AUTOSTART" == '1' ]]; then
+   sonobus_start.sh
+   exit 0
+  fi
+fi
+
diff --git a/stage3/06-install-jamulus/files/jamulus_start.conf b/stage3/06-install-jamulus/files/jamulus_start.conf
@@ -3,13 +3,15 @@
 #
 # Optional configuration parameters for "jamulus_start.sh"
 #
+# JAMULUS_AUTOSTART=1                            # 1=automatically start Jamulus at boot time
 # JAMULUS_SERVER=<jamulus_server_dns_name_or_ip> # automatically connect to this server, then shut down after 120 mins. (default unset)
 # MASTER_LEVEL=<level%>                          # force alsamixer master level to this value when starting.  (default unset) 
 # CAPTURE_LEVEL=<level%>                         # force alsamixer capture level to this value when starting. (default: unset)
 # AJ_SNAPSHOT=<snapshot_file_name>               # file name of alsa/jack connection snapshot, default: ajs-um2-stereo_only.xml (2 input channels fed separately to Jamulus)
 # JAMULUS_TIMEOUT=<timeout>                      # if auto-connecting to JAMULUS_SERVER, time out and shut down after <timeout> (default "120m")
 # JAMULUS_ALSA_DEVICE=<alsa_device>              # Alsa card of USB Interface (default "card 2") 
 
+JAMULUS_AUTOSTART=1
 JAMULUS_SERVER=
 MASTER_LEVEL="75%"
 CAPTURE_LEVEL="75%"

diff --git a/stage3/08-install-sonobus/files/sonobus_start.conf b/stage3/08-install-sonobus/files/sonobus_start.conf
@@ -3,11 +3,13 @@
 #
 # Optional configuration parameters for "sonobus_start.sh"
 #
+# SONOBUS_AUTOSTART=1                            # 1=automatically start SonoBus at boot time
 # MASTER_LEVEL=<level%>                          # force alsamixer master level to this value when starting.  (default unset) 
 # CAPTURE_LEVEL=<level%>                         # force alsamixer capture level to this value when starting. (default: unset)
 # AJ_SNAPSHOT=<snapshot_file_name>               # file name of alsa/jack connection snapshot, default: ajs-stereo-sonobus.xml (2 input channels fed separately to SonoBus)
 # SONOBUS_ALSA_DEVICE=<alsa_device>              # Alsa card of USB Interface (default "card 2") 
 
+SONOBUS_AUTOSTART=0
 MASTER_LEVEL="75%"
 CAPTURE_LEVEL="75%"
 AJ_SNAPSHOT=ajs-stereo-sonobus.xml