updated package bundling
This commit is contained in:
@@ -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'
|
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'
|
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'
|
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
|
ALL_PKGS="$BASE_PKGS"
|
||||||
[ -z "$NOEXTRAS" ] && NOEXTRAS=n
|
[ -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...'
|
echo 'Setting up host environment...'
|
||||||
pkg upgrade -y
|
pkg upgrade -y
|
||||||
@@ -39,16 +39,8 @@ alias roidclean='killall pulseaudio virgl_test_server_android' # ROID_INST
|
|||||||
EOF
|
EOF
|
||||||
echo 'Installing Void Linux...'
|
echo 'Installing Void Linux...'
|
||||||
proot-distro install ghcr.io/void-linux/void-glibc-full
|
proot-distro install ghcr.io/void-linux/void-glibc-full
|
||||||
echo 'Base distro setup...'
|
echo 'Package setup...'
|
||||||
proot-distro run void-glibc-full -- sh -c "xbps-install -Suyy && xbps-install -Sy $BASE_PKGS"
|
proot-distro run void-glibc-full -- sh -c "xbps-install -Suyy && xbps-install -Sy $ALL_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 'Post-installation steps (CLI)...'
|
echo 'Post-installation steps (CLI)...'
|
||||||
proot-distro run void-glibc-full -e TERMUX_HOME=$HOME -- sh $HOME/roid/postinstall-cli
|
proot-distro run void-glibc-full -e TERMUX_HOME=$HOME -- sh $HOME/roid/postinstall-cli
|
||||||
if [ "$NOX" = "n" ]; then
|
if [ "$NOX" = "n" ]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user