From eda8078a0fcb0cd5ac94b39497a74c33ea0b7414 Mon Sep 17 00:00:00 2001
From: lemniskett <lemniskett@outlook.com>
Date: Mon, 11 Jan 2021 13:32:05 +0700
Subject: [PATCH] Use Archboxctl for managing service.

---
 archbox-desktop.bash |  0
 archbox.bash         |  0
 archboxcommand.bash  |  0
 archboxinit.bash     |  0
 chroot_setup.bash    | 11 ++++-------
 copyresolv.bash      |  0
 install.sh           |  1 +
 remount_run.bash     |  0
 8 files changed, 5 insertions(+), 7 deletions(-)
 mode change 100755 => 100644 archbox-desktop.bash
 mode change 100755 => 100644 archbox.bash
 mode change 100755 => 100644 archboxcommand.bash
 mode change 100755 => 100644 archboxinit.bash
 mode change 100755 => 100644 chroot_setup.bash
 mode change 100755 => 100644 copyresolv.bash
 mode change 100755 => 100644 install.sh
 mode change 100755 => 100644 remount_run.bash

diff --git a/archbox-desktop.bash b/archbox-desktop.bash
old mode 100755
new mode 100644
diff --git a/archbox.bash b/archbox.bash
old mode 100755
new mode 100644
diff --git a/archboxcommand.bash b/archboxcommand.bash
old mode 100755
new mode 100644
diff --git a/archboxinit.bash b/archboxinit.bash
old mode 100755
new mode 100644
diff --git a/chroot_setup.bash b/chroot_setup.bash
old mode 100755
new mode 100644
index e7d38de..5283395
--- a/chroot_setup.bash
+++ b/chroot_setup.bash
@@ -15,13 +15,10 @@ pacman-key --init
 pacman-key --populate archlinux
 msg "Installing essential packages..."
 pacman -Syu base base-devel xorg pulseaudio nano --noconfirm
-msg "Installing servicectl..."
-mkdir -p /usr/local/share/servicectl/enabled
-curl -L 'https://raw.githubusercontent.com/lemniskett/servicectl/master/servicectl' > /usr/local/share/servicectl/servicectl 2>/dev/null
-curl -L 'https://raw.githubusercontent.com/lemniskett/servicectl/master/serviced' > /usr/local/share/servicectl/serviced 2>/dev/null
-chmod +x /usr/local/share/servicectl/service{d,ctl}
-ln -s /usr/local/share/servicectl/servicectl /usr/local/bin/servicectl
-ln -s /usr/local/share/servicectl/serviced /usr/local/bin/serviced
+msg "Installing archboxctl..."
+mkdir -p /usr/local/bin
+curl https://raw.githubusercontent.com/lemniskett/archboxctl/master/archboxctl.bash > /usr/local/bin/archboxctl
+chmod 755 /usr/local/bin/archboxctl
 msg "Setting up locale..."
 echo "Uncomment needed locale, enter to continue"
 read
diff --git a/copyresolv.bash b/copyresolv.bash
old mode 100755
new mode 100644
diff --git a/install.sh b/install.sh
old mode 100755
new mode 100644
index c55a883..c191b98
--- a/install.sh
+++ b/install.sh
@@ -8,6 +8,7 @@ install -v -D -m 755 ./copyresolv.bash /usr/local/share/archbox/bin/copyresolv
 install -v -D -m 755 ./archboxcommand.bash /usr/local/share/archbox/bin/archbox
 install -v -D -m 755 ./remount_run.bash /usr/local/share/archbox/bin/remount_run
 install -v -D -m 755 ./chroot_setup.bash /usr/local/share/archbox/chroot_setup.bash
+install -v -D -m 755 ./archboxctl.bash /usr/local/share/archbox/archboxctl.bash
 install -v -D -m 755 ./archboxinit.bash /usr/local/share/archbox/bin/archboxinit
 [[ -z $1 ]] && exit 0
 
diff --git a/remount_run.bash b/remount_run.bash
old mode 100755
new mode 100644