From d480a569dc7a2106f702404b4a943f70c504e82a Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 1 Aug 2013 16:58:44 +0200
Subject: adapted new naming conventions for all the scripts.

for our own systemd service files:
	use:	service-file-name.service
	ex:	/etc/systemd/system/setup-proxy.service

ALL systemd services files need to be under /etc/systemd/system

for our own scripts:
	use:	tool-what_it_does
	ex:	/opt/openslx/scripts/systemd-setup_proxy

ALL our scripts under /opt/openslx/scripts
---
 .../etc/systemd/system/load-german-keymap.service  |  2 +-
 .../data/opt/openslx/scripts/load_german_keymaps   | 22 ----------------------
 .../openslx/scripts/systemd-load_german_keymaps    | 22 ++++++++++++++++++++++
 3 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100755 remote/modules/german/data/opt/openslx/scripts/load_german_keymaps
 create mode 100755 remote/modules/german/data/opt/openslx/scripts/systemd-load_german_keymaps

(limited to 'remote/modules/german')

diff --git a/remote/modules/german/data/etc/systemd/system/load-german-keymap.service b/remote/modules/german/data/etc/systemd/system/load-german-keymap.service
index e31406fb..c26346fe 100644
--- a/remote/modules/german/data/etc/systemd/system/load-german-keymap.service
+++ b/remote/modules/german/data/etc/systemd/system/load-german-keymap.service
@@ -7,4 +7,4 @@ Before=shutdown.target
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/opt/openslx/scripts/load_german_keymaps
+ExecStart=/opt/openslx/scripts/systemd-load_german_keymaps
diff --git a/remote/modules/german/data/opt/openslx/scripts/load_german_keymaps b/remote/modules/german/data/opt/openslx/scripts/load_german_keymaps
deleted file mode 100755
index c7dbbb33..00000000
--- a/remote/modules/german/data/opt/openslx/scripts/load_german_keymaps
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# Script serves as container script for a systemd-call due to the buggyness of several
-# loadkeys-implementations <= kbd (Linux keyboard tools) 1.15.3.
-# This bug can be detected through failure of the command pipe 'dumpkeys|loadkeys' yielding
-# the message "unknown keysym 'compose'.
-
-# So we first try to insert a keymap including compose-lines:
-loadkeys /opt/openslx/keymaps/german_qwertz_compose_keyboard_translation.map
-ERR=$?
-
-# ... if this fails we enter a keymap without compose-lines:
-if [[ "$ERR" -eq 0 ]]; then
-	exit 0			# in that case everything went smooth - exit.
-else
-	loadkeys /opt/openslx/keymaps/german_qwertz_keyboard_translation.map		# insert a keymap without compose lines
-	ERR=$?
-fi
-
-# if at this point the second keymap insertion failed we pass the errorlevel to
-# systemd - we cannot do more at this point.
-
-exit $ERR
diff --git a/remote/modules/german/data/opt/openslx/scripts/systemd-load_german_keymaps b/remote/modules/german/data/opt/openslx/scripts/systemd-load_german_keymaps
new file mode 100755
index 00000000..c7dbbb33
--- /dev/null
+++ b/remote/modules/german/data/opt/openslx/scripts/systemd-load_german_keymaps
@@ -0,0 +1,22 @@
+#!/bin/bash
+# Script serves as container script for a systemd-call due to the buggyness of several
+# loadkeys-implementations <= kbd (Linux keyboard tools) 1.15.3.
+# This bug can be detected through failure of the command pipe 'dumpkeys|loadkeys' yielding
+# the message "unknown keysym 'compose'.
+
+# So we first try to insert a keymap including compose-lines:
+loadkeys /opt/openslx/keymaps/german_qwertz_compose_keyboard_translation.map
+ERR=$?
+
+# ... if this fails we enter a keymap without compose-lines:
+if [[ "$ERR" -eq 0 ]]; then
+	exit 0			# in that case everything went smooth - exit.
+else
+	loadkeys /opt/openslx/keymaps/german_qwertz_keyboard_translation.map		# insert a keymap without compose lines
+	ERR=$?
+fi
+
+# if at this point the second keymap insertion failed we pass the errorlevel to
+# systemd - we cannot do more at this point.
+
+exit $ERR
-- 
cgit v1.2.3-55-g7522