From badba29a1025f8536c3fdc32beb956b7564f9b0a Mon Sep 17 00:00:00 2001 From: pika Date: Sun, 25 May 2025 12:58:55 +0200 Subject: [PATCH] might work now.. --- ly.sh | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/ly.sh b/ly.sh index 0935231..7521fb5 100644 --- a/ly.sh +++ b/ly.sh @@ -105,7 +105,7 @@ esac } - check-path() { + check-zig-path() { if ! command_exists zig; then export PATH="$ZIG_PATH:$PATH" else @@ -114,13 +114,21 @@ } check-zig() { - local version_needed version_current + if command_exists zig; then + local version_needed version_current - version_needed=0.14.0 - version_current=$(zig version) + version_needed=0.14.0 + version_current=$(zig version) - if [ "$version_current" != "$version_needed" ]; then - throw "Version missmatch, you have $version_current, needed is $version_needed" + if [ "$version_current" != "$version_needed" ]; then + throw "Version missmatch, you have $version_current, needed is $version_needed" + return 69 + fi + + # return no exit code if zig version is correct + return 0 + else + return 69 fi } @@ -168,11 +176,13 @@ echo-error "${err:-}" fi - line - pen bold green "ZIG_PATH=$zig" - line + # line + # pen bold green "ZIG_PATH=$zig" + # line [[ -d "$zig" ]] && ZIG_PATH="$zig" || throw bold red "Something went terribly wrong!" + + check-zig-path } get-ly() { @@ -234,15 +244,14 @@ throw "Error when installing dependencies.." fi - if get-zig; then - # pen bold grey "Downloadet zig" - if check-path; then - if get-ly; then - if build-ly; then - line - check "Installed ly successfully!" - fi - fi + if ! check-zig; then + get-zig + fi + + if get-ly; then + if build-ly; then + line + check "Installed ly successfully!" fi fi ;;