diff --git a/install.sh b/install.sh index b042195..26a1bd0 100755 --- a/install.sh +++ b/install.sh @@ -242,14 +242,14 @@ function install_software() { additional_packages_pid=$! log_with_timing "Installing additional packages in background" "$start_time" - # Wait for apt remove to complete before continuing - wait "$apt_remove_pid" - # Remove conflicting APT packages in background to avoid blocking start_time=$(start_operation "Removing conflicting APT packages") (sudo apt remove bat ripgrep -y) & apt_remove_pid=$! log_with_timing "Removing conflicting APT packages" "$start_time" + + # Wait for apt remove to complete before continuing + wait "$apt_remove_pid" if [[ "$PARALLEL_MODE" == "true" ]]; then # Parallel installation mode with fast track for essential tools @@ -454,6 +454,10 @@ function install_software() { CC=clang cargo install --locked bottom log_with_timing "Installing bottom tools via cargo" "$start_time" + start_time=$(start_operation "Installing cloudflare-speed-cli via cargo") + CC=clang cargo install --git https://github.com/kavehtehrani/cloudflare-speed-cli --features tui + log_with_timing "Installing cloudflare-speed-cli via cargo" "$start_time" + # Bat cache build start_time=$(start_operation "Building bat cache") ~/.cargo/bin/bat cache --build diff --git a/scripts/parallel-install.sh b/scripts/parallel-install.sh index 8018e4d..9e8ea7a 100755 --- a/scripts/parallel-install.sh +++ b/scripts/parallel-install.sh @@ -126,6 +126,7 @@ install_cargo_packages_parallel() { run_parallel "cargo_tree_sitter" "CC=clang cargo install --locked tree-sitter-cli" run_parallel "cargo_bottom" "CC=clang cargo install --locked bottom" run_parallel "cargo_zellij" "CC=clang cargo install --locked zellij" + run_parallel "cargo_cfspeed" "CC=clang cargo install --git https://github.com/kavehtehrani/cloudflare-speed-cli --features tui" # PRIORITY BATCH 4: Optional tools (lowest priority) echo "[$(date '+%Y-%m-%d %H:%M:%S')] 🎯 Starting priority batch 4: Optional tools" >> $LOG_FILE @@ -138,7 +139,7 @@ install_cargo_packages_parallel() { # Wait for all remaining installations to complete local remaining_operations=( "cargo_eza" "cargo_ripgrep" "cargo_fd_find" "cargo_bat" - "cargo_tree_sitter" "cargo_bottom" "cargo_zellij" "cargo_pay_respects" + "cargo_tree_sitter" "cargo_bottom" "cargo_zellij" "cargo_cfspeed" "cargo_pay_respects" ) if wait_for_parallel "${remaining_operations[@]}"; then @@ -194,6 +195,7 @@ install_cargo_packages_background() { run_parallel "cargo_tree_sitter" "CC=clang cargo install --locked tree-sitter-cli" run_parallel "cargo_bottom" "CC=clang cargo install --locked bottom" run_parallel "cargo_zellij" "CC=clang cargo install --locked zellij" + run_parallel "cargo_cfspeed" "CC=clang cargo install --git https://github.com/kavehtehrani/cloudflare-speed-cli --features tui" # PRIORITY BATCH 4: Optional tools (lowest priority) echo "[$(date '+%Y-%m-%d %H:%M:%S')] 🎯 Starting priority batch 4: Optional tools" >> $LOG_FILE @@ -206,7 +208,7 @@ install_cargo_packages_background() { # Wait for all remaining installations to complete local remaining_operations=( "cargo_eza" "cargo_ripgrep" "cargo_fd_find" "cargo_bat" - "cargo_tree_sitter" "cargo_bottom" "cargo_zellij" "cargo_pay_respects" + "cargo_tree_sitter" "cargo_bottom" "cargo_zellij" "cargo_cfspeed" "cargo_pay_respects" ) if wait_for_parallel "${remaining_operations[@]}"; then @@ -241,6 +243,7 @@ install_cargo_packages_background_remaining() { echo "[$(date '+%Y-%m-%d %H:%M:%S')] 🎯 Starting development tools" >> $LOG_FILE run_parallel "cargo_bottom" "CC=clang cargo install --locked bottom" run_parallel "cargo_zellij" "CC=clang cargo install --locked zellij" + run_parallel "cargo_cfspeed" "CC=clang cargo install --git https://github.com/kavehtehrani/cloudflare-speed-cli --features tui" # PRIORITY BATCH 4: Optional tools (lowest priority) echo "[$(date '+%Y-%m-%d %H:%M:%S')] 🎯 Starting optional tools" >> $LOG_FILE @@ -253,7 +256,7 @@ install_cargo_packages_background_remaining() { # Wait for all remaining installations to complete local remaining_operations=( "cargo_eza" "cargo_ripgrep" "cargo_fd_find" "cargo_bat" - "cargo_bottom" "cargo_zellij" "cargo_pay_respects" + "cargo_bottom" "cargo_zellij" "cargo_cfspeed" "cargo_pay_respects" ) if wait_for_parallel "${remaining_operations[@]}"; then