From 6ae7f049902679834bf810c85172dd6e67acba3f Mon Sep 17 00:00:00 2001 From: Marc Coquand Date: Wed, 22 May 2024 11:13:31 -0500 Subject: Update install scripts --- hooks/post-up/installations | 2 -- hooks/post-up/network-manager | 8 -------- hooks/pre-up/1-ksh | 6 +++--- hooks/pre-up/3-void | 12 ------------ 4 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 hooks/post-up/installations delete mode 100755 hooks/post-up/network-manager 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 -- cgit v1.2.3