From: yomguy <>
Date: Thu, 8 Jul 2010 23:33:15 +0000 (+0000)
Subject: mv dirs
X-Git-Tag: 1.0~184
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=dc1c3e76bf4fa62df6571c3214425183567158e0;p=telecaster-server.git

mv dirs
---

diff --git a/conf/etc/telecaster/home/fluxbox/autostart.sh b/conf/etc/telecaster/home/fluxbox/autostart.sh
new file mode 100755
index 0000000..0bbb37b
--- /dev/null
+++ b/conf/etc/telecaster/home/fluxbox/autostart.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+# Ensure the XPATH variable is set appropriately to the Linux distribution's Xvfb installation path.
+
+pid=`pgrep jack-rack`
+
+if [ ! $pid = "" ]; then 
+ sleep 1
+else
+ jack-rack -n /etc/telecaster/eq_comp_limit_02.rack &
+ sleep 10
+ jack_connect system:capture_1 jack_rack:in_1
+ jack_connect system:capture_2 jack_rack:in_2
+fi
+
+qjackctl &
+
+edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n LIVE -p jack_rack &
+sleep 3
+
+# MONO setup
+jack_disconnect jack_rack:out_2 LIVE:in_2
+jack_connect jack_rack:out_1  LIVE:in_1
+jack_connect jack_rack:out_1  LIVE:in_2
+
+# STEREO setup
+#jack_connect jack_rack:out_1  LIVE:in_1
+#jack_connect jack_rack:out_2  LIVE:in_2
+
+
+
diff --git a/conf/etc/telecaster/home/vnc/xstartup b/conf/etc/telecaster/home/vnc/xstartup
new file mode 100755
index 0000000..416bd91
--- /dev/null
+++ b/conf/etc/telecaster/home/vnc/xstartup
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# Uncomment the following two lines for normal desktop:
+# unset SESSION_MANAGER
+# exec /etc/X11/xinit/xinitrc
+
+[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup
+[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources
+xsetroot -solid grey
+#xset s 0
+vncconfig -iconic &
+#x-terminal-emulator -geometry 80x24+10+10 -ls -title "$VNCDESKTOP Desktop" &
+#x-window-manager &
+#jackd -R -dalsa -r44100 -p2048 -n4 -D -Chw:0,1 -Phw:0,1 -S &
+fluxbox &
+
diff --git a/conf/home/fluxbox/autostart.sh b/conf/home/fluxbox/autostart.sh
deleted file mode 100755
index 0bbb37b..0000000
--- a/conf/home/fluxbox/autostart.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# Ensure the XPATH variable is set appropriately to the Linux distribution's Xvfb installation path.
-
-pid=`pgrep jack-rack`
-
-if [ ! $pid = "" ]; then 
- sleep 1
-else
- jack-rack -n /etc/telecaster/eq_comp_limit_02.rack &
- sleep 10
- jack_connect system:capture_1 jack_rack:in_1
- jack_connect system:capture_2 jack_rack:in_2
-fi
-
-qjackctl &
-
-edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n LIVE -p jack_rack &
-sleep 3
-
-# MONO setup
-jack_disconnect jack_rack:out_2 LIVE:in_2
-jack_connect jack_rack:out_1  LIVE:in_1
-jack_connect jack_rack:out_1  LIVE:in_2
-
-# STEREO setup
-#jack_connect jack_rack:out_1  LIVE:in_1
-#jack_connect jack_rack:out_2  LIVE:in_2
-
-
-
diff --git a/conf/home/vnc/xstartup b/conf/home/vnc/xstartup
deleted file mode 100755
index 416bd91..0000000
--- a/conf/home/vnc/xstartup
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Uncomment the following two lines for normal desktop:
-# unset SESSION_MANAGER
-# exec /etc/X11/xinit/xinitrc
-
-[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup
-[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources
-xsetroot -solid grey
-#xset s 0
-vncconfig -iconic &
-#x-terminal-emulator -geometry 80x24+10+10 -ls -title "$VNCDESKTOP Desktop" &
-#x-window-manager &
-#jackd -R -dalsa -r44100 -p2048 -n4 -D -Chw:0,1 -Phw:0,1 -S &
-fluxbox &
-