Update system install script

2 files changed, 15 insertions, 17 deletions

diff --git a/system/etc/init.d/killi3 b/system/etc/init.d/killi3
deleted file mode 100755
index 1fa83aa..0000000
--- a/system/etc/init.d/killi3
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	before killprocs
-}
-
-start() {
-	for socket in `find /run/user/*/i3 -name ipc-socket*`; do
-		i3-msg -s $socket exit
-	done
-}
diff --git a/system_install b/system_install
index 1caf757..bf93b15 100755
--- a/system_install
+++ b/system_install
@@ -22,15 +22,26 @@ if [ -e /etc/arch-release ]; then
 	fi
 fi
 
-read -p "Laptop ACPI and pm? (Y/n) "
-if [[ $REPLY =~ ^[Yy]?$ ]]; then
+if ask "Laptop ACPI and pm"; then
 	inst system/etc/acpi/handler.sh /etc/acpi/handler.sh
 	inst system/etc/pm/sleep.d/10lock /etc/pm/sleep.d/10lock
 fi
 
-read -p "Wpa supplicant? (Y/n) "
-if [[ $REPLY =~ ^[Yy]?$ ]]; then
+if ask "System PATH profile"; then
+	inst system/etc/profile.d/path.sh /etc/profile.d/path.sh
+fi
+
+if ask "X11 configuration"; then
+	inst system/etc/X11/ /etc/X11/
+fi
+
+if ask "System-wide PulseAudio configuration"; then
+	inst system/etc/pulse/ /etc/pulse/
+fi
+
+if ask "Wpa supplicant"; then
 	# TODO
+	true
 fi
 
 # As final step just ensure that correct user is owning system files