From 4e97dfe11f8ee158b0d96dd190e1b4b4fda4034a Mon Sep 17 00:00:00 2001
From: whoops <31858202+whoopsme1337@users.noreply.github.com>
Date: Wed, 30 Jul 2025 22:18:19 +0700
Subject: [PATCH] Update setup.sh

---
 setup.sh | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/setup.sh b/setup.sh
index 12ede39..119d17b 100644
--- a/setup.sh
+++ b/setup.sh
@@ -2,6 +2,7 @@
 
 set -e
 
+# Color codes
 GREEN='\033[0;32m'
 RED='\033[0;31m'
 CYAN='\033[0;36m'
@@ -11,6 +12,12 @@ NC='\033[0m' # No Color
 echo -e "${CYAN}🎯 Installing system dependencies...${NC}"
 sudo apt update && sudo apt install -y build-essential pkg-config libssl-dev git curl
 
+# Version check helper
+version_lt() {
+    [ "$(printf '%s\n' "$1" "$2" | sort -V | head -n1)" != "$2" ]
+}
+
+# Rust install/check
 MIN_RUST_VERSION="1.70.0"
 should_install_rust=false
 
@@ -18,11 +25,11 @@ if command -v rustc &> /dev/null && command -v cargo &> /dev/null; then
     INSTALLED_RUST_VERSION=$(rustc --version | awk '{print $2}')
     echo -e "${CYAN}🔍 Detected rustc ${INSTALLED_RUST_VERSION}${NC}"
 
-    if [ "$(printf '%s\n' "$INSTALLED_RUST_VERSION" "$MIN_RUST_VERSION" | sort -V | head -n1)" != "$MIN_RUST_VERSION" ]; then
-        echo -e "${YELLOW}⚠️ Rust version is too old (< ${MIN_RUST_VERSION}). Updating via rustup...${NC}"
+    if version_lt "$INSTALLED_RUST_VERSION" "$MIN_RUST_VERSION"; then
+        echo -e "${YELLOW}⚠️ Rust version too old (< ${MIN_RUST_VERSION}). Updating...${NC}"
         should_install_rust=true
     else
-        echo -e "${GREEN}✅ Rust version is sufficient. Skipping installation.${NC}"
+        echo -e "${GREEN}✅ Rust version is sufficient. Skipping install.${NC}"
     fi
 else
     echo -e "${YELLOW}🚫 Rust or Cargo not found.${NC}"
@@ -30,23 +37,28 @@ else
 fi
 
 if [ "$should_install_rust" = true ]; then
-    echo -e "${CYAN}🚀 Installing rustup (Rust & Cargo)...${NC}"
+    echo -e "${CYAN}🚀 Installing Rust via rustup...${NC}"
     curl https://sh.rustup.rs -sSf | sh -s -- -y
     source $HOME/.cargo/env
 fi
 
+# Ensure cargo bin path is in PATH
+export PATH="$HOME/.cargo/bin:$PATH"
+
 # Handle --force flag
 if [[ "$1" == "--force" ]]; then
     echo -e "${YELLOW}⚠️ --force enabled. Removing existing 'pipe' folder...${NC}"
     rm -rf pipe
 fi
 
+# Clone if not exists
 if [ -d "pipe" ]; then
     echo -e "${YELLOW}📁 'pipe' folder already exists. Skipping clone.${NC}"
 else
     echo -e "${CYAN}📦 Cloning Pipe repo...${NC}"
     git clone https://github.com/PipeNetwork/pipe.git
 fi
+
 cd pipe
 
 echo -e "${CYAN}🔧 Building Pipe CLI...${NC}"
@@ -57,10 +69,12 @@ else
     exit 1
 fi
 
+# Final check
 if command -v pipe &> /dev/null; then
     echo -e "\n${GREEN}🚀 All set! You can now run:${NC}"
     echo -e "    ${CYAN}pipe --help${NC}\n"
+    echo -e "${CYAN}📍 Installed binary: $(which pipe)${NC}"
 else
-    echo -e "\n${RED}⚠️ Setup complete, but 'pipe' command not found in PATH.${NC}"
-    echo -e "${YELLOW}You might need to restart your terminal or add ~/.cargo/bin to PATH.${NC}\n"
+    echo -e "\n${RED}⚠️ Build completed, but 'pipe' not found in PATH.${NC}"
+    echo -e "${YELLOW}Try running: export PATH=\"\$HOME/.cargo/bin:\$PATH\"${NC}"
 fi