From 84392f19ce2e70e79d3f7f384e6697fbdf56cf99 Mon Sep 17 00:00:00 2001 From: Spirit Date: Mon, 19 Aug 2024 12:52:36 +0300 Subject: [PATCH] make doas optional --- setup-void.sh | 56 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 10 deletions(-) diff --git a/setup-void.sh b/setup-void.sh index 7575869..3e0a56f 100755 --- a/setup-void.sh +++ b/setup-void.sh @@ -6,17 +6,53 @@ # TODO: setup compositor # TODO: install nvidia drivers (if nvidia gpu installed) + +install_doas=1 + +usage() { + echo "Usage: $0 [OPTIONS]" + echo 'Options:' + echo ' -h, --help Display this message' + echo " --no-doas Don't install doas" +} + +while [ $# -gt 0 ]; do + case $1 in + -h | --help) + usage + exit 0 + ;; + --no-doas) + install_doas=0 + ;; + *) + echo "Invalid argument: $1" >&2 + usage + exit 1 + ;; + esac + shift +done + # update the package manager sudo xbps-install -Suy xbps # setup doas -sudo xbps-install -y opendoas -sudo bash -c "echo 'permit nopass $USER as root' > /etc/doas.conf" +if [ install_doas -eq 1 ]; then + sudo xbps-install -y opendoas + sudo bash -c "echo 'permit nopass $USER as root' > /etc/doas.conf" +fi + +if command -v doas &> /dev/null; then + doas="doas" +else + doas="sudo" +fi # update conflicted deps -doas xbps-install -yu util-linux +$doas xbps-install -yu util-linux # install deps required for setup -doas xbps-install -y git rsync make gcc libX11-devel libXft-devel libXinerama-devel xorg-server xinit xauth xorg-fonts xorg-input-drivers pkg-config +$doas xbps-install -y git rsync make gcc libX11-devel libXft-devel libXinerama-devel xorg-server xinit xauth xorg-fonts xorg-input-drivers pkg-config mkdir ./.setup-void.temp cd ./.setup-void.temp @@ -29,24 +65,24 @@ git clone https://github.com/spirit-x64/st.git rsync -a --exclude='.git/' --exclude='LICENSE' --exclude='.gitignore' dotfiles/ $HOME cd dwm -doas make clean install +$doas make clean install cd ../dmenu -doas make clean install +$doas make clean install cd ../st -doas make clean install +$doas make clean install cd .. echo 'exec dwm' > $HOME/.xinitrc # system full-update -doas xbps-install -Suy +$doas xbps-install -Suy # install other packages i use -doas xbps-install -y patch wget curl vim firefox vscode juliaup yt-dlp tree +$doas xbps-install -y patch wget curl vim firefox vscode juliaup yt-dlp tree -doas ln -s /usr/bin/julialauncher /usr/bin/julia +$doas ln -s /usr/bin/julialauncher /usr/bin/julia juliaup self update juliaup add 1.0.0