From de3dd54c2cff4bd3234977dcfe188fec5882e885 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sun, 6 Nov 2016 09:38:42 +0000
Subject: adjust paths

---
 Makefile            |  4 ++--
 kogaionlive.service | 11 ----------
 kogaionlive.sh      | 60 -----------------------------------------------------
 redcorelive.service | 11 ++++++++++
 redcorelive.sh      | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 73 insertions(+), 73 deletions(-)
 delete mode 100644 kogaionlive.service
 delete mode 100755 kogaionlive.sh
 create mode 100644 redcorelive.service
 create mode 100755 redcorelive.sh

diff --git a/Makefile b/Makefile
index dec3f65..71e859f 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,6 @@ install:
 	for d in $(SUBDIRS); do $(MAKE) -C $$d install; done
 
 	install -d $(DESTDIR)/$(LIBEXECDIR)
-	install -m 0755 kogaionlive.sh $(DESTDIR)/$(LIBEXECDIR)/
+	install -m 0755 redcorelive.sh $(DESTDIR)/$(LIBEXECDIR)/
 	install -d $(DESTDIR)/$(SYSTEMD_UNITDIR)/
-	install -m 0644 kogaionlive.service $(DESTDIR)/$(SYSTEMD_UNITDIR)/
+	install -m 0644 redcorelive.service $(DESTDIR)/$(SYSTEMD_UNITDIR)/
diff --git a/kogaionlive.service b/kogaionlive.service
deleted file mode 100644
index 268b43c..0000000
--- a/kogaionlive.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Kogaion live user setup
-Before=display-manager.service getty.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=true
-ExecStart=/usr/libexec/kogaionlive.sh
-
-[Install]
-WantedBy=multi-user.target
diff --git a/kogaionlive.sh b/kogaionlive.sh
deleted file mode 100755
index fc90fb8..0000000
--- a/kogaionlive.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env bash
-
-export local liveuser="kogaion"
-
-checkroot() {
-	if [[ "$(whoami)" != root ]] ; then
-		echo "No root, no play! Bye bye!"
-		exit 1
-	fi
-}
-
-kogaion_is_live() {
-	if [[ ! -L "/dev/mapper/live-rw" ]] ; then
-		echo "The system is not running in live mode, aborting!"
-		exit 1
-	fi
-}
-
-kogaion_add_live_user() {
-	/usr/sbin/useradd -u 1000 -g 100 -o -m -s /bin/bash "$liveuser" > /dev/null 2>&1
-}
-
-kogaion_live_user_groups() {
-	for group in tty disk lp wheel uucp console audio cdrom tape video cdrw usb plugdev messagebus portage vboxsf vboxguest ; do
-		gpasswd -a "$liveuser" "$group" > /dev/null 2>&1
-	done
-}
-
-kogaion_live_user_password() {
-	echo "$liveuser":"$liveuser" | /usr/sbin/chpasswd > /dev/null 2>&1
-}
-
-kogaion_live_locale_switch() {
-	export local keymap_toset="$(cat /proc/cmdline | cut -d " " -f5 | cut -d "=" -f2)"
-	export local lang_toset="$(cat /proc/cmdline | cut -d " " -f6 | cut -d "=" -f2)"
-	if [[ "$lang_toset" != "en_US.utf8" ]] || [[ "$keymap_toset" != "us" ]] ; then
-		/usr/bin/localectl set-locale LANG="$lang_toset" > /dev/null 2>&1
-		/usr/bin/localectl set-keymap "$keymap_toset" > /dev/null 2>&1
-		/usr/sbin/env-update --no-ldconfig > /dev/null 2>&1
-	fi
-}
-
-kogaion_live_installer_desktop() {
-	cp "/usr/share/applications/calamares.desktop" "/home/"$liveuser"/Desktop"
-	sed -i "s/"Name=Calamares"/"Name=Kogaion\ Installer"/g" "/home/"$liveuser"/Desktop/calamares.desktop"
-	chmod 755 "/home/"$liveuser"/Desktop/calamares.desktop"
-}
-
-main() {
-	if checkroot && kogaion_is_live ; then
-		kogaion_add_live_user
-		kogaion_live_user_groups
-		kogaion_live_user_password
-		kogaion_live_installer_desktop
-		kogaion_live_locale_switch
-	fi
-}
-
-main
-exit 0
diff --git a/redcorelive.service b/redcorelive.service
new file mode 100644
index 0000000..2881da5
--- /dev/null
+++ b/redcorelive.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Kogaion live user setup
+Before=display-manager.service getty.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/libexec/redcorelive.sh
+
+[Install]
+WantedBy=multi-user.target
diff --git a/redcorelive.sh b/redcorelive.sh
new file mode 100755
index 0000000..696aa48
--- /dev/null
+++ b/redcorelive.sh
@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+export local liveuser="redcore"
+
+checkroot() {
+	if [[ "$(whoami)" != root ]] ; then
+		echo "No root, no play! Bye bye!"
+		exit 1
+	fi
+}
+
+redcore_is_live() {
+	if [[ ! -L "/dev/mapper/live-rw" ]] ; then
+		echo "The system is not running in live mode, aborting!"
+		exit 1
+	fi
+}
+
+redcore_add_live_user() {
+	/usr/sbin/useradd -u 1000 -g 100 -o -m -s /bin/bash "$liveuser" > /dev/null 2>&1
+}
+
+redcore_live_user_groups() {
+	for group in tty disk lp wheel uucp console audio cdrom tape video cdrw usb plugdev messagebus portage vboxsf vboxguest ; do
+		gpasswd -a "$liveuser" "$group" > /dev/null 2>&1
+	done
+}
+
+redcore_live_user_password() {
+	echo "$liveuser":"$liveuser" | /usr/sbin/chpasswd > /dev/null 2>&1
+}
+
+redcore_live_locale_switch() {
+	export local keymap_toset="$(cat /proc/cmdline | cut -d " " -f5 | cut -d "=" -f2)"
+	export local lang_toset="$(cat /proc/cmdline | cut -d " " -f6 | cut -d "=" -f2)"
+	if [[ "$lang_toset" != "en_US.utf8" ]] || [[ "$keymap_toset" != "us" ]] ; then
+		/usr/bin/localectl set-locale LANG="$lang_toset" > /dev/null 2>&1
+		/usr/bin/localectl set-keymap "$keymap_toset" > /dev/null 2>&1
+		/usr/sbin/env-update --no-ldconfig > /dev/null 2>&1
+	fi
+}
+
+redcore_live_installer_desktop() {
+	cp "/usr/share/applications/calamares.desktop" "/home/"$liveuser"/Desktop"
+	sed -i "s/"Name=Calamares"/"Name=Kogaion\ Installer"/g" "/home/"$liveuser"/Desktop/calamares.desktop"
+	chmod 755 "/home/"$liveuser"/Desktop/calamares.desktop"
+}
+
+main() {
+	if checkroot && redcore_is_live ; then
+		redcore_add_live_user
+		redcore_live_user_groups
+		redcore_live_user_password
+		redcore_live_installer_desktop
+		redcore_live_locale_switch
+	fi
+}
+
+main
+exit 0
-- 
cgit v1.2.3