From 1a9c57611e62f91f0c7e37487b0986e5ddd3d8a8 Mon Sep 17 00:00:00 2001 From: Luxferre Date: Wed, 3 Jun 2026 09:59:34 +0300 Subject: [PATCH] updated package bundling --- install | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/install b/install index 3411e57..b2d6230 100644 --- a/install +++ b/install @@ -14,10 +14,10 @@ EXTRA_PKGS='libcurl-devel dtach fzf tcl tcllib tcltls janet jpm expect zip p7zip X11_PKGS='xcursor-themes xcursor-vanilla-dmz-aa setxkbmap xkb-switch xdg-utils xdg-user-dirs xrdb xsel xdotool xrandr xmodmap harfbuzz-devel imlib2-devel gd-devel openssl-devel freetype-devel libxkbcommon-devel xcb-util-keysyms-devel libXft-devel' X_APPS='dbus mesa mesa-dri mesa-demos mesa-vaapi glxinfo glxgears glmark2 i3 i3lock i3status i3cat i3wsr rofi autotiling scrot dunst feh volumeicon' FONT_PKGS='noto-fonts-ttf noto-fonts-ttf-extra noto-fonts-cjk noto-fonts-emoji noto-fonts-ttf-variable liberation-fonts-ttf font-firacode fonts-roboto-ttf' -GUI_PKGS="$X11_PKGS $FONT_PKGS $X_APPS" -[ -z "$NOX" ] && NOX=n -[ -z "$NOEXTRAS" ] && NOEXTRAS=n +ALL_PKGS="$BASE_PKGS" +[ -z "$NOEXTRAS" ] && ALL_PKGS="$ALL_PKGS EXTRA_PKGS" +[ -z "$NOX" ] && ALL_PKGS="$ALL_PKGS $X11_PKGS $FONT_PKGS $X_APPS" echo 'Setting up host environment...' pkg upgrade -y @@ -39,16 +39,8 @@ alias roidclean='killall pulseaudio virgl_test_server_android' # ROID_INST EOF echo 'Installing Void Linux...' proot-distro install ghcr.io/void-linux/void-glibc-full -echo 'Base distro setup...' -proot-distro run void-glibc-full -- sh -c "xbps-install -Suyy && xbps-install -Sy $BASE_PKGS" -if [ "$NOEXTRAS" = "n" ]; then - echo 'Extra package setup...' - proot-distro run void-glibc-full -- sh -c "xbps-install -Suy && xbps-install -Sy $EXTRA_PKGS" -fi -if [ "$NOX" = "n" ]; then - echo 'GUI setup...' - proot-distro run void-glibc-full -- sh -c "xbps-install -Suyy && xbps-install -Sy $GUI_PKGS" -fi +echo 'Package setup...' +proot-distro run void-glibc-full -- sh -c "xbps-install -Suyy && xbps-install -Sy $ALL_PKGS" echo 'Post-installation steps (CLI)...' proot-distro run void-glibc-full -e TERMUX_HOME=$HOME -- sh $HOME/roid/postinstall-cli if [ "$NOX" = "n" ]; then