From: Guillaume Pellerin <guillaume.pellerin@parisson.com>
Date: Sun, 6 Oct 2024 14:11:42 +0000 (+0200)
Subject: rn
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=aff1bbca60df1f4940606e0aebf63afa4d2de16c;p=telecaster-server.git

rn
---

diff --git a/env/.fluxbox/init b/env/.fluxbox/init
deleted file mode 100644
index a47c424..0000000
--- a/env/.fluxbox/init
+++ /dev/null
@@ -1,3 +0,0 @@
-session.menuFile:	~/.fluxbox/menu
-session.keyFile:	~/.fluxbox/keys
-session.configVersion:	13
diff --git a/env/.fluxbox/startup b/env/.fluxbox/startup
deleted file mode 100644
index 8b0ad31..0000000
--- a/env/.fluxbox/startup
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# fluxbox startup-script:
-#
-# Lines starting with a '#' are ignored.
-
-# Change your keymap:
-xmodmap "/home/telecaster/.Xmodmap"
-
-# Applications you want to run with fluxbox.
-# MAKE SURE THAT APPS THAT KEEP RUNNING HAVE AN ''&'' AT THE END.
-#
-# unclutter -idle 2 &
-# wmnd &
-# wmsmixer -w &
-# idesk &
-#
-# Debian-local change:
-#   - fbautostart has been added with a quick hack to check to see if it
-#     exists. If it does, we'll start it up by default.
-which fbautostart > /dev/null
-if [ $? -eq 0 ]; then
-    fbautostart
-fi
-
-/srv/telecaster/telecaster-server/bin/streaming/telecaster.sh &
-
-# And last but not least we start fluxbox.
-# Because it is the last app you have to run it with ''exec'' before it.
-
-exec fluxbox
-# or if you want to keep a log:
-# exec fluxbox -log "$$FLUXBOX_DIR/log"
diff --git a/env/.vnc/xstartup b/env/.vnc/xstartup
deleted file mode 100755
index 73d19e4..0000000
--- a/env/.vnc/xstartup
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-#xrdb "$HOME/.Xresources"
-#xsetroot -solid grey
-
-#x-terminal-emulator -geometry 80x24+10+10 -ls -title "$VNCDESKTOP Desktop" &
-#x-window-manager &
-# Fix to make GNOME work
-
-#export XKL_XMODMAP_DISABLE=1
-#export XDG_RUNTIME_DIR=/run/user/$(id -u)
-#export DBUS_SESSION_BUS_ADDRESS="unix:path=${XDG_RUNTIME_DIR}/bus"
-
-#/etc/X11/Xsession                                                                                                                                                                                            
-#startplasma-x11
-#startplasma-wayland
-startfluxbox
-
diff --git a/home/.fluxbox/init b/home/.fluxbox/init
new file mode 100644
index 0000000..a47c424
--- /dev/null
+++ b/home/.fluxbox/init
@@ -0,0 +1,3 @@
+session.menuFile:	~/.fluxbox/menu
+session.keyFile:	~/.fluxbox/keys
+session.configVersion:	13
diff --git a/home/.fluxbox/startup b/home/.fluxbox/startup
new file mode 100644
index 0000000..8b0ad31
--- /dev/null
+++ b/home/.fluxbox/startup
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# fluxbox startup-script:
+#
+# Lines starting with a '#' are ignored.
+
+# Change your keymap:
+xmodmap "/home/telecaster/.Xmodmap"
+
+# Applications you want to run with fluxbox.
+# MAKE SURE THAT APPS THAT KEEP RUNNING HAVE AN ''&'' AT THE END.
+#
+# unclutter -idle 2 &
+# wmnd &
+# wmsmixer -w &
+# idesk &
+#
+# Debian-local change:
+#   - fbautostart has been added with a quick hack to check to see if it
+#     exists. If it does, we'll start it up by default.
+which fbautostart > /dev/null
+if [ $? -eq 0 ]; then
+    fbautostart
+fi
+
+/srv/telecaster/telecaster-server/bin/streaming/telecaster.sh &
+
+# And last but not least we start fluxbox.
+# Because it is the last app you have to run it with ''exec'' before it.
+
+exec fluxbox
+# or if you want to keep a log:
+# exec fluxbox -log "$$FLUXBOX_DIR/log"
diff --git a/home/.vnc/xstartup b/home/.vnc/xstartup
new file mode 100755
index 0000000..73d19e4
--- /dev/null
+++ b/home/.vnc/xstartup
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+#xrdb "$HOME/.Xresources"
+#xsetroot -solid grey
+
+#x-terminal-emulator -geometry 80x24+10+10 -ls -title "$VNCDESKTOP Desktop" &
+#x-window-manager &
+# Fix to make GNOME work
+
+#export XKL_XMODMAP_DISABLE=1
+#export XDG_RUNTIME_DIR=/run/user/$(id -u)
+#export DBUS_SESSION_BUS_ADDRESS="unix:path=${XDG_RUNTIME_DIR}/bus"
+
+#/etc/X11/Xsession                                                                                                                                                                                            
+#startplasma-x11
+#startplasma-wayland
+startfluxbox
+