ryan/dotfiles
1
0
Fork 0
Code Activity

fix: script discovery in setup.sh

Browse Source
This commit is contained in:
Ryan Hamilton
2025-08-04 22:09:27 -05:00
parent c76ed8e31e
commit 980fa75310
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/00-check-dependencies.sh
View File

@@ -45,7 +45,7 @@ check_dependencies() {
echo ""
done
exit 1
return 1
fi
log_success "All dependencies satisfied"

11
setup.sh
View File

@@ -23,20 +23,19 @@ log_info "Working directory: $DOTFILES_DIR"
if [ -d "$DOTFILES_DIR/scripts" ]; then
log_info "Running setup scripts..."
# Look for numbered scripts and run them in order
script_count=0
for script in "$DOTFILES_DIR"/scripts/[0-9][0-9]-*.sh; do
# Find and run all numbered scripts using shell globbing
for script in "$DOTFILES_DIR/scripts"/[0-9][0-9]-*.sh; do
if [ -f "$script" ]; then
script_name=$(basename "$script")
log_info "Running $script_name..."
if bash "$script" "$DOTFILES_DIR"; then
# Source the script to run in the current shell and receive $DOTFILES_DIR as $1
if source "$script" "$DOTFILES_DIR"; then
log_success "✓ $script_name completed"
else
log_error "✗ $script_name failed"
exit 1
fi
((script_count++))
fi
done
@@ -44,7 +43,7 @@ if [ -d "$DOTFILES_DIR/scripts" ]; then
if [ $script_count -eq 0 ]; then
log_warning "No numbered scripts found in scripts/ directory"
else
log_success "Completed $script_count setup script(s)"
log_success "Completed $script_count setup scripts"
fi
else
log_error "No scripts directory found! Something went wrong with the installation."