From ca7d4e3460fd22d3ecba54cdaf189f5f6cec814e Mon Sep 17 00:00:00 2001 From: gibbyb Date: Thu, 18 Dec 2025 21:08:19 +0000 Subject: [PATCH] Update script to be really pretty --- setup/scripts/install-packages | 2 +- setup/scripts/link-dotfiles | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/setup/scripts/install-packages b/setup/scripts/install-packages index b17d515..7397328 100755 --- a/setup/scripts/install-packages +++ b/setup/scripts/install-packages @@ -7,7 +7,7 @@ exists() { command -v "$1" >/dev/null 2>&1; } # --- Defined Paths --- PANAMA_PATH="$HOME/.local/share/Panama" -echo -e "--- Installing Repositories ---" +echo -e "\n--- Installing Repositories ---" log "Installing RPM Fusion Free and Nonfree Repositories" sudo dnf install -y https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm > /dev/null 2>&1 log "Enabling Fedora Cisco OpenH264 Repository" diff --git a/setup/scripts/link-dotfiles b/setup/scripts/link-dotfiles index 17ac55b..aa8d64d 100755 --- a/setup/scripts/link-dotfiles +++ b/setup/scripts/link-dotfiles @@ -1,5 +1,8 @@ #!/usr/bin/env bash +# --- Helper functions --- +log() { echo -e "\033[1;34m[INFO]\033[0m $*"; } + # Define paths as they have not been defined by new bashrc yet! PANAMA_PATH="${PANAMA_PATH:-$HOME/.local/share/Panama}" PANAMA_BASH="${PANAMA_BASH:-$PANAMA_PATH/config/bash}" @@ -11,36 +14,39 @@ CONFIG="$HOME/.config" mkdir -p "$PANAMA_OLD" # --- Bashrc --- +echo -e "\n--- Replacing .bashrc ---" # Backup existing .bashrc if it's a regular file if [ -f "$HOME/.bashrc" ] && [ ! -L "$HOME/.bashrc" ]; then + log "Backing up existing .bashrc" mv "$HOME/.bashrc" "$PANAMA_OLD/.bashrc" fi # Remove old symlink if it exists and points somewhere else if [ -L "$HOME/.bashrc" ]; then + log "Removing old .bashrc symlink" rm "$HOME/.bashrc" fi # Symlink Panama .bashrc file to ~/.bashrc +log "Symlinking Panama .bashrc file to ~/.bashrc" ln -s "$PANAMA_BASH/.bashrc" "$HOME/.bashrc" dirs=("espanso" "forge" "ghostty" "kitty" "nvim" "tmux") for dir in "${dirs[@]}"; do - echo "--- Setting up $dir ---" + echo -e "\n--- Setting up $dir ---" # Remove old symlink if it exists if [ -L "$CONFIG/$dir" ]; then rm "$CONFIG/$dir" - echo "Removed old symlink at $CONFIG/$dir" + log "Removed old symlink at $CONFIG/$dir" fi # Backup existing directory if it exists if [ -d "$CONFIG/$dir" ]; then mv "$CONFIG/$dir" "$PANAMA_OLD/$dir" - echo "Moved existing $dir config to $PANAMA_OLD/$dir" + log "Moved existing $dir config to $PANAMA_OLD/$dir" fi # Create symlink ln -s "$PANAMA_DOT/$dir" "$CONFIG/$dir" - echo "Linked $PANAMA_DOT/$dir → $CONFIG/$dir" - echo + log "Linked $PANAMA_DOT/$dir → $CONFIG/$dir" done