From 8666527ddc878b05016b4310351e60331bb2cc1d Mon Sep 17 00:00:00 2001 From: Thomas Forgione Date: Sat, 3 May 2025 00:08:14 +0200 Subject: [PATCH] Debian / Arch --- test-env.sh | 4 ++-- tforgione.sh | 13 +++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/test-env.sh b/test-env.sh index d42d8c9..c995b35 100755 --- a/test-env.sh +++ b/test-env.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash debian() { - docker build . --tag debian-user --debug + docker build . --tag debian-user --target debian-user --debug docker container run -it debian-user bash } archlinux() { - docker build . --tag archlinux-user --debug + docker build . --tag archlinux-user --target archlinux-user --debug docker container run -it archlinux-user bash } diff --git a/tforgione.sh b/tforgione.sh index fef1c3b..c6c2c65 100755 --- a/tforgione.sh +++ b/tforgione.sh @@ -226,9 +226,14 @@ run() { fi if [ $should_install_rust -eq 1 ]; then - packages+=(build-essential) - packages+=(pkg-config) - packages+=(libssl-dev) + if [ $has_apt -eq 1 ]; then + packages+=(build-essential) + packages+=(pkg-config) + packages+=(libssl-dev) + elif [ $has_pacman -eq 1 ]; then + packages+=(base) + packages+=(base-devel) + fi fi if [ $should_install_python ]; then @@ -239,8 +244,8 @@ run() { packages+=(python3-pip) elif [ $has_pacman -eq 1 ]; then packages+=(python) - fi + fi if [ $should_install_hyprland -eq 1 ]; then