From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 4 Apr 2022 09:05:11 +0000 (+0200)
Subject: use $FLUXBOX_DIR
X-Git-Tag: 1.2~18
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d0cb2a2fb642803770f74372bbe86f340bc42c5d;p=telecaster-server.git

use $FLUXBOX_DIR
---

diff --git a/src/home/telecaster/.fluxbox/startup b/src/home/telecaster/.fluxbox/startup
index db5f3e1..fd00bef 100644
--- a/src/home/telecaster/.fluxbox/startup
+++ b/src/home/telecaster/.fluxbox/startup
@@ -23,6 +23,8 @@ if [ $? -eq 0 ]; then
     fbautostart
 fi
 
+$FLUXBOX_DIR=/home/telecaster/.fluxbox
+
 # telecaster
 
 konsole &
@@ -31,11 +33,11 @@ qjackctl &
 
 sleep 3
 
-/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast-gst1.sh &
+$FLUXBOX_DIR/scripts/tc_audio_mp3_icecast-gst1.sh &
 
 sleep 3
 
-/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh &
+$FLUXBOX_DIR/scripts/tc_video_simple_webm_stream-gst1.sh &
 
 sleep 3
 
@@ -62,9 +64,8 @@ sleep 3
 # jack_connect system:capture_3 gst-launch-1.0-01:in_jackaudiosrc0_2
 
 # Additional local bash scripts
-LOCAL_STARTUP=/home/telecaster/.fluxbox/startup.local
-if [ -f $LOCAL_STARTUP ]; then
-    sh $LOCAL_STARTUP
+if [ -f $FLUXBOX_DIR/startup.local ]; then
+    sh $FLUXBOX_DIR/startup.local
 fi
 
 #Audio monitor
@@ -79,4 +80,4 @@ deefuzzer /etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml &
 
 exec fluxbox
 # or if you want to keep a log:
-# exec fluxbox -log "/home/telecaster/.fluxbox/log"
+# exec fluxbox -log "$$FLUXBOX_DIR/log"