summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Coquand <marc@mccd.space>2024-05-22 11:13:31 -0500
committerMarc Coquand <marc@mccd.space>2024-05-22 11:13:31 -0500
commit6ae7f049902679834bf810c85172dd6e67acba3f (patch)
tree7da6f26c0051b87115ad001e0082b1848ac70156
parent40145309063002c2727cf30608c9535ce2f30718 (diff)
downloadrcm-6ae7f049902679834bf810c85172dd6e67acba3f.tar.gz
rcm-6ae7f049902679834bf810c85172dd6e67acba3f.tar.bz2
rcm-6ae7f049902679834bf810c85172dd6e67acba3f.zip
Update install scripts
-rw-r--r--hooks/post-up/installations2
-rwxr-xr-xhooks/post-up/network-manager8
-rwxr-xr-xhooks/pre-up/1-ksh6
-rwxr-xr-xhooks/pre-up/3-void12
4 files changed, 3 insertions, 25 deletions
diff --git a/hooks/post-up/installations b/hooks/post-up/installations
deleted file mode 100644
index 320f86d..0000000
--- a/hooks/post-up/installations
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-xsync
diff --git a/hooks/post-up/network-manager b/hooks/post-up/network-manager
deleted file mode 100755
index b7b0ec9..0000000
--- a/hooks/post-up/network-manager
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if ! $(xpkg | grep -q NetworkManager); then
- sudo xbps-install -y NetworkManager
- sudo ln -s /etc/sv/NetworkManager /var/service
- sudo rm /var/service/wpa_supplicant
- sudo sv start NetworkManager
-fi
diff --git a/hooks/pre-up/1-ksh b/hooks/pre-up/1-ksh
index ba33b10..30dd8e1 100755
--- a/hooks/pre-up/1-ksh
+++ b/hooks/pre-up/1-ksh
@@ -1,6 +1,6 @@
#!/bin/sh
-if ! [ -x "$(command -v ksh)" ]; then
- sudo xbps-install -y ksh
- chsh -s /bin/ksh
+if ! [ -x "$(command -v mksh)" ]; then
+ sudo xbps-install -y mksh
+ echo "Installed, run chsh -s /bin/mksh"
fi
diff --git a/hooks/pre-up/3-void b/hooks/pre-up/3-void
index ab494c3..f8b7bc5 100755
--- a/hooks/pre-up/3-void
+++ b/hooks/pre-up/3-void
@@ -5,18 +5,6 @@ if ! [ -x "$(command -v xpkg)" ]; then
sudo xbps-install -y xtools
fi
-if ! [ -x "$(command -v nmtui)" ]; then
- sudo xbps-install -y NetworkManager
- sudo ln -s /etc/sv/NetworkManager /var/service
- sudo sv stop wpa_supplicant
- sudo sv start NetworkManager
-fi
-
-# Set up file sync
-if [ ! -f ~/repository.list ]; then
- xpkg -m > ~/repository.list
-fi
-
if [ ! "$(cat ~/repository.list | grep 'void-repo-nonfree')" ]; then
sudo xbps-install -y void-repo-nonfree
fi