null2264/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(script/bootstrap): Fix bootstrap is soft-locked if doas is installed

Browse source 
but not yet configured

Also fix doas config for macOS, macOS' "wheel" is called "staff"
This commit is contained in:
Ahmad Ansori Palembani 2024-07-20 19:02:54 +07:00
parent 0349769225
commit 1cf64aad03
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
bootstrap
View file

@ -32,7 +32,11 @@ case "$OSTYPE" in
"darwin"* ) DISTRO="apple" ;;
* ) DISTRO="$(cat /etc/*-release | grep ^ID | head -n1 | cut -d '=' -f2 | cut -d '"' -f2)" ;;
esac
[ "$SUDO" = "" ] && { is_package_exists doas && SUDO="doas" || SUDO="sudo"; }
[ "$SUDO" = "" ] && {
FALLBACK_SUDO="sudo"
is_package_exists doas && SUDO="doas" || SUDO=$FALLBACK_SUDO
doas echo "" >/dev/null 2>/dev/null || SUDO=$FALLBACK_SUDO
}
[ "$PACMAN" = "" ] && {
case $DISTRO in
"arch" ) PACMAN="pacman" ;;
@ -114,12 +118,16 @@ ln -si $ZI_DOTFILES/.config/zsh $HOME/.config/zsh
is_package_exists doas && {
echo "Configuring doas..."
echo "permit persist :wheel" > /tmp/doas.conf.tmp
case "$OSTYPE" in
"darwin"* ) echo "permit persist :staff" > /tmp/doas.conf.tmp ;;
* ) echo "permit persist :wheel" > /tmp/doas.conf.tmp ;;
esac
echo "permit nopass root as root" >> /tmp/doas.conf.tmp
echo "=======/etc/doas.conf======="
cat /tmp/doas.conf.tmp
echo "============================"
$SUDO cp -i /tmp/doas.conf.tmp /etc/doas.conf
$SUDO ln -si /etc/doas.conf /usr/local/etc/doas.conf
}
echo "============================"