From dbf626829105fc3771759007fece86fd68148b23 Mon Sep 17 00:00:00 2001 From: pika Date: Sat, 3 May 2025 17:02:05 +0200 Subject: [PATCH] wip --- install.sh | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/install.sh b/install.sh index 324a29e..d828742 100755 --- a/install.sh +++ b/install.sh @@ -197,20 +197,17 @@ __validate__() { } instZellij() { - cargoInstall() { - if command_exists cargo; then - rustup update - sleep 1 - cargo install --locked zellij - fi - } - - if ! command_exists zellij; then - if ! cargoInstall; then - echo_error "Something went wrong.. Please look for the installation yourself!" - echo "Documentation: https://zellij.dev/documentation/installation.html#third-party-repositories" - fi + if ! command_exists rustup; then + _install rustup + rustup default stable fi + + if command_exists cargo; then + rustup update + sleep 1 + cargo install --locked zellij + fi + } __dep__() { @@ -235,7 +232,12 @@ __dep__() { fi done - instZellij + if ! command_exists zellij; then + if ! instZellij; then + echo_error "Something went wrong.. Please look for the installation yourself!" + echo "Documentation: https://zellij.dev/documentation/installation.html#third-party-repositories" + fi + fi } pkg_optional() {