Skip to content

Fix remove pid and add speedtest #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
djensenius merged 1 commit into from
Feb 7, 2026
Merged

Fix remove pid and add speedtest #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
9 changes: 6 additions & 3 deletions scripts/parallel-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down