mirror of https://github.com/ericonr/dotfiles.git
void.sh: use dash instead of bash
- change how functions are declared
- use _ instead of - for function names
- use eval instead of ${!var}
This commit is contained in:
parent
4f47661740
commit
08e21a0649
111
void/void.sh
111
void/void.sh
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env bash
|
||||
#!/bin/sh
|
||||
|
||||
# _
|
||||
# ___ _ __(_) ___ ___ _ __ _ __
|
||||
|
|
@ -12,44 +12,44 @@
|
|||
bold=$(tput bold)
|
||||
normal=$(tput sgr0)
|
||||
|
||||
function print-bold() {
|
||||
print_bold() {
|
||||
printf "%s%s%s" "${bold}" "$1" "${normal}"
|
||||
}
|
||||
|
||||
function print-item() {
|
||||
printf -- "- %s:" "$(print-bold $1)"
|
||||
print_item() {
|
||||
printf -- "- %s:" "$(print_bold $1)"
|
||||
}
|
||||
|
||||
function nonfree() {
|
||||
nonfree() {
|
||||
[ -z "$NO_NONFREE" ] && echo "$@"
|
||||
}
|
||||
|
||||
base="chrony elogind iwd vsv"
|
||||
base_desc="$(print-item base) Install base system utilities."
|
||||
base_desc="$(print_item base) Install base system utilities."
|
||||
|
||||
luks="cryptsetup"
|
||||
luks_desc="$(print-item luks) Install support for LUKS."
|
||||
luks_desc="$(print_item luks) Install support for LUKS."
|
||||
|
||||
uefi_bundle="binutils gummiboot sbsigntool"
|
||||
uefi_bundle_desc="$(print-item uefi_bundle) Install tools for creating UEFI bundles."
|
||||
uefi_bundle_desc="$(print_item uefi_bundle) Install tools for creating UEFI bundles."
|
||||
|
||||
disk_tools="fscrypt udisks2"
|
||||
disk_tools_desc="$(print-item disk_tools) Install fscrypt and UDisks2."
|
||||
disk_tools_desc="$(print_item disk_tools) Install fscrypt and UDisks2."
|
||||
|
||||
su_disk_tools="autofs hdparm"
|
||||
su_disk_tools_desc="$(print-item su_disk_tools) Install AutoFS and hdparm"
|
||||
su_disk_tools_desc="$(print_item su_disk_tools) Install AutoFS and hdparm"
|
||||
|
||||
refind="refind"
|
||||
refind_desc="$(print-item refind) Install the rEFInd boot manager."
|
||||
refind_desc="$(print_item refind) Install the rEFInd boot manager."
|
||||
|
||||
zfs="zfs zfsbootmenu"
|
||||
zfs_desc="$(print-item zfs) Install support for ZFS."
|
||||
zfs_desc="$(print_item zfs) Install support for ZFS."
|
||||
|
||||
security="apparmor"
|
||||
security_desc="$(print-item security) Install security related packages."
|
||||
security_desc="$(print_item security) Install security related packages."
|
||||
|
||||
popcorn="PopCorn"
|
||||
popcorn_desc="$(print-item popcorn) Install PopCorn usage statistics."
|
||||
popcorn_desc="$(print_item popcorn) Install PopCorn usage statistics."
|
||||
|
||||
_browser="ncdu ranger"
|
||||
_device="usbutils"
|
||||
|
|
@ -59,97 +59,97 @@ _shell="fish-shell lolcat-c starship tmux"
|
|||
_tools="bat bsdtar fd mdcat neovim p7zip parallel ripgrep stow"
|
||||
_void="vsv xtools"
|
||||
term="python3 ${_browser} ${_device} ${_monitor} ${_net} ${_shell} ${_tools} ${_void}"
|
||||
term_desc="$(print-item term) Install basic terminal utilities."
|
||||
term_desc="$(print_item term) Install basic terminal utilities."
|
||||
|
||||
ssh="fuse-sshfs rsync"
|
||||
ssh_desc="$(print-item ssh) Install SSH utilities."
|
||||
ssh_desc="$(print_item ssh) Install SSH utilities."
|
||||
|
||||
intel="intel-gpu-tools libva-intel-driver intel-media-driver mesa-intel-dri
|
||||
intel-undervolt $(nonfree intel-ucode)"
|
||||
intel_desc="$(print-item intel) Install packages for media decode and GPU stuff in Intel-land."
|
||||
intel_desc="$(print_item intel) Install packages for media decode and GPU stuff in Intel-land."
|
||||
|
||||
nvidia="$(nonfree nvidia nvidia-opencl)"
|
||||
nvidia_desc="$(print-item nvidia) Install NVIDIA drivers."
|
||||
nvidia_desc="$(print_item nvidia) Install NVIDIA drivers."
|
||||
|
||||
graphics="Vulkan-Tools clinfo mesa-demos"
|
||||
graphics_desc="$(print-item graphics) Install graphics stack testing tools."
|
||||
graphics_desc="$(print_item graphics) Install graphics stack testing tools."
|
||||
|
||||
fonts="font-awesome5 font-fira-ttf font-ibm-plex-ttf liberation-fonts-ttf
|
||||
noto-fonts-ttf noto-fonts-emoji ttf-bitstream-vera"
|
||||
fonts_desc="$(print-item fonts) Basic fonts necessary for browsing the web and normal GUIs."
|
||||
fonts_desc="$(print_item fonts) Basic fonts necessary for browsing the web and normal GUIs."
|
||||
|
||||
themes="breeze breeze-gtk papirus-icon-theme"
|
||||
themes_desc="$(print-item themes) Color and mouse themes for a good color setup."
|
||||
themes_desc="$(print_item themes) Color and mouse themes for a good color setup."
|
||||
|
||||
wm="Waybar alacritty brightnessctl fzf grim jq mako redshift slurp sway swayidle
|
||||
swaylock wl-clipboard wofi go"
|
||||
wm_desc="$(print-item wm) Install SwayWM and supporting packages. Depends on fonts and themes."
|
||||
wm_desc="$(print_item wm) Install SwayWM and supporting packages. Depends on fonts and themes."
|
||||
|
||||
wayland="wf-recorder wayfire wf-shell cage"
|
||||
wayland_desc="$(print-item wayland) Install Wayfire and Cage."
|
||||
wayland_desc="$(print_item wayland) Install Wayfire and Cage."
|
||||
|
||||
xorg="xfce4 xorg"
|
||||
xorg_desc="$(print-item xorg) Install XFCE4 and Xorg."
|
||||
xorg_desc="$(print_item xorg) Install XFCE4 and Xorg."
|
||||
|
||||
audio="alsa-utils playerctl pulseaudio pavucontrol"
|
||||
audio_desc="$(print-item audio) Install PulseAudio and alsa."
|
||||
audio_desc="$(print_item audio) Install PulseAudio and alsa."
|
||||
|
||||
media="bluez mpv mpv-mpris youtube-dl spotifyd spotify-tui imv ImageMagick"
|
||||
media_desc="$(print-item media) Install mpv, imv and spotify CLI programs."
|
||||
media_desc="$(print_item media) Install mpv, imv and spotify CLI programs."
|
||||
|
||||
dev="clang cmake make meson ninja git rustup tokei valgrind gdb strace"
|
||||
dev_desc="$(print-item dev) Install the CLang compiler, some build systems and rustup."
|
||||
dev_desc="$(print_item dev) Install the CLang compiler, some build systems and rustup."
|
||||
|
||||
emacs="emacs-gtk3 hunspell hunspell-en_US hunspell-pt_BR shellcheck zstd"
|
||||
emacs_desc="$(print-item emacs) Install the GUI version of Emacs."
|
||||
emacs_desc="$(print_item emacs) Install the GUI version of Emacs."
|
||||
|
||||
qt5="qt5-wayland qt5ct konversation qutebrowser pdf.js"
|
||||
qt5_desc="$(print-item qt5) Install Qt5 for Wayland, plus Qutebrowser and Konversation."
|
||||
qt5_desc="$(print_item qt5) Install Qt5 for Wayland, plus Qutebrowser and Konversation."
|
||||
|
||||
elisa="elisa"
|
||||
elisa_desc="$(print-item elisa) Install the Elisa music player."
|
||||
elisa_desc="$(print_item elisa) Install the Elisa music player."
|
||||
|
||||
mozilla="firefox thunderbird"
|
||||
mozzila_desc="$(print-item mozilla) Install Firefox and Thunderbird."
|
||||
mozzila_desc="$(print_item mozilla) Install Firefox and Thunderbird."
|
||||
|
||||
office="libreoffice libreoffice-i18n-en-US libreoffice-i18n-pt-BR"
|
||||
office_desc="$(print-item office) Install Libreoffice."
|
||||
office_desc="$(print_item office) Install Libreoffice."
|
||||
|
||||
pdf="zathura zathura-pdf-poppler"
|
||||
pdf_desc="$(print-item pdf) Install Zathura."
|
||||
pdf_desc="$(print_item pdf) Install Zathura."
|
||||
|
||||
flatpak="flatpak xdg-desktop-portal xdg-desktop-portal-gtk xdg-user-dirs xdg-user-dirs-gtk xdg-utils"
|
||||
flatpak_desc="$(print-item flatpak) Install Flatpak and supporting packages."
|
||||
flatpak_desc="$(print_item flatpak) Install Flatpak and supporting packages."
|
||||
|
||||
embedded="arduino-cli cross-arm-none-eabi cross-arm-none-eabi-gdb python3-pyserial openocd screen sdcc"
|
||||
embedded_desc="$(print-item embedded) Install embedded toolchain and programmer/debugger software."
|
||||
embedded_desc="$(print_item embedded) Install embedded toolchain and programmer/debugger software."
|
||||
|
||||
kicad="kicad kicad-footprints kicad-library kicad-packages3D kicad-symbols kicad-templates"
|
||||
kicad_desc="$(print-item kicad) Install KiCad EDA and its resource packages."
|
||||
kicad_desc="$(print_item kicad) Install KiCad EDA and its resource packages."
|
||||
|
||||
ate="tcc gtk+3-devel vte3-devel pkgconf"
|
||||
ate_desc="$(print-item ate) Install the packages necessary to use ate compiled by TinyCC."
|
||||
ate_desc="$(print_item ate) Install the packages necessary to use ate compiled by TinyCC."
|
||||
|
||||
void_docs="mdBook mdbook-linkcheck pandoc vmdfmt"
|
||||
void_docs_desc="$(print-item void_docs) Install development tools for Void Docs."
|
||||
void_docs_desc="$(print_item void_docs) Install development tools for Void Docs."
|
||||
|
||||
xbps_devel="zlib-devel libressl-devel libarchive-devel"
|
||||
xbps_devel_desc="$(print-item xbps_devel) Install development dependencies for XBPS."
|
||||
xbps_devel_desc="$(print_item xbps_devel) Install development dependencies for XBPS."
|
||||
|
||||
base_env="$base $term $ssh $intel $fonts $themes $wm $audio $media $qt5 $popcorn
|
||||
$mozilla $pdf $emacs $security $su_disk_tools"
|
||||
base_env_desc="$(print-item base_env) [ base term ssh intel fonts themes wm audio
|
||||
base_env_desc="$(print_item base_env) [ base term ssh intel fonts themes wm audio
|
||||
media qt5 popcorn mozilla pdf emacs security su_disk_tools ]"
|
||||
|
||||
all="$base_env $luks $uefi_bundle $disk_tools $refind $zfs $dev $elisa $office
|
||||
$flatpak $embedded $kicad $ate $void_docs $xbps_devel $wayland $nvidia $graphics $xorg"
|
||||
all_desc="$(print-item all) [ base_env luks uefi_bundle disk_tools refind
|
||||
all_desc="$(print_item all) [ base_env luks uefi_bundle disk_tools refind
|
||||
zfs dev elisa office flatpak embedded kicad ate void_docs xbps_devel
|
||||
wayland xorg nvidia graphics ]"
|
||||
|
||||
function print_help () {
|
||||
print_help () {
|
||||
cat <<EOF
|
||||
$(print-bold Usage): $0 collection [collections...]
|
||||
$(print_bold Usage): $0 collection [collections...]
|
||||
|
||||
These are the available package collections:
|
||||
$base_desc
|
||||
|
|
@ -192,14 +192,14 @@ $base_env_desc
|
|||
$all_desc
|
||||
|
||||
Recommended individual apps:
|
||||
$(print-item bolt)
|
||||
$(print-item cscope)
|
||||
$(print-item sl)
|
||||
$(print-item podman)
|
||||
$(print-item riot-desktop)
|
||||
$(print-item sent)
|
||||
$(print_item bolt)
|
||||
$(print_item cscope)
|
||||
$(print_item sl)
|
||||
$(print_item podman)
|
||||
$(print_item riot-desktop)
|
||||
$(print_item sent)
|
||||
|
||||
$(print-bold "Environment variables:")
|
||||
$(print_bold "Environment variables:")
|
||||
- ADDITIONAL_PACKAGES: env variable for individual packages
|
||||
- NO_NONFREE: to disable nonfree repo
|
||||
- YES: don't ask for confirmation
|
||||
|
|
@ -211,7 +211,7 @@ EOF
|
|||
|
||||
[ -n "$YES" ] && FLAGS="-y"
|
||||
|
||||
function check-nonfree() {
|
||||
check_nonfree() {
|
||||
if [ -z "$NO_NONFREE" ] ; then
|
||||
if ! xbps-query void-repo-nonfree >/dev/null ; then
|
||||
xbps-install $FLAGS -S void-repo-nonfree
|
||||
|
|
@ -227,7 +227,7 @@ if [ -z "$1" ] ; then
|
|||
else
|
||||
xbps-install -S
|
||||
xbps-install $FLAGS -u xbps
|
||||
check-nonfree
|
||||
check_nonfree
|
||||
echo "Collections: $@"
|
||||
|
||||
for coll in "$@"
|
||||
|
|
@ -236,11 +236,12 @@ else
|
|||
echo "$coll doesn't exist"
|
||||
exit
|
||||
fi
|
||||
packages+=" ${!coll}"
|
||||
eval "new_packages=\"\$$coll\""
|
||||
packages="${packages} ${new_packages}"
|
||||
done
|
||||
|
||||
packages+=" $ADDITIONAL_PACKAGES"
|
||||
echo "Packages: $packages"
|
||||
packages="${packages} $ADDITIONAL_PACKAGES"
|
||||
echo "Packages: ${packages}"
|
||||
|
||||
xbps-install $FLAGS $packages
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue