From c1a25545f7449191852cecd337102fbfb841442b Mon Sep 17 00:00:00 2001 From: Ali Date: Wed, 2 Jul 2025 20:22:10 +0100 Subject: [PATCH] update hash --- README.md | 2 +- du_setup.sh | 37 +++++++++++++++++++++++++------------ du_setup.sh.sha256 | 2 +- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 7050bc2..4f8a61a 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ sha256sum du_setup.sh Compare the output hash to the one below. They must match exactly. -`891eb9bf1e1c2b51c9ba008d330612cade70a2c929e033dbd570259fa30ff33d` +`e41a6ffcabd4eb30673aebe096de41f8cbbc9bb5824a509e9c1c41e4845ef78f` ### 3\. Run the Script diff --git a/du_setup.sh b/du_setup.sh index 75bbe0c..fb37a9f 100644 --- a/du_setup.sh +++ b/du_setup.sh @@ -54,14 +54,27 @@ set -euo pipefail # Exit on error, undefined vars, pipe failures # --- GLOBAL VARIABLES & CONFIGURATION --- -# Colors for output -RED='\033[0;31m' -GREEN='\033[0;32m' -YELLOW='\033[1;33m' -BLUE='\033[0;34m' -PURPLE='\033[0;35m' -CYAN='\033[0;36m' -NC='\033[0m' # No Color +# --- Colors for output --- +if command -v tput >/dev/null 2>&1 && tput setaf 1 >/dev/null 2>&1; then + RED=$(tput setaf 1) + GREEN=$(tput setaf 2) + YELLOW="$(tput bold)$(tput setaf 3)" + BLUE=$(tput setaf 4) + PURPLE=$(tput setaf 5) + CYAN=$(tput setaf 6) + BOLD=$(tput bold) + NC=$(tput sgr0) +else + RED='\033[0;31m' + GREEN='\033[0;32m' + YELLOW='\033[1;33m' + BLUE='\033[0;34m' + PURPLE='\033[0;35m' + CYAN='\033[0;36m' + NC='\033[0m' + BOLD='' +fi + # Script variables SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" @@ -488,14 +501,14 @@ setup_user() { echo echo -e "${PURPLE}ℹ ACTION REQUIRED: Save the keys to your local machine:${NC}" echo -e "${CYAN}1. Save the PRIVATE key to ~/.ssh/${USERNAME}_key:${NC}" - echo "${RED} ==PRIVATE KEY BELOW THIS LINE== ${NC}" + echo -e "${RED} vvvv PRIVATE KEY BELOW THIS LINE vvvv ${NC}" cat "$TEMP_KEY_FILE" - echo "${RED} ^^^^ PRIVATE KEY ABOVE THIS LINE ^^^^^ ${NC}" + echo -e "${RED} ^^^^ PRIVATE KEY ABOVE THIS LINE ^^^^^ ${NC}" echo echo -e "${CYAN}2. Save the PUBLIC key to verify or use elsewhere:${NC}" - echo "-----SSH PUBLIC KEY-----" + echo "====SSH PUBLIC KEY BELOW THIS LINE====" cat "$SSH_DIR/id_ed25519.pub" - echo "-----SSH PUBLIC KEY-----" + echo "====SSH PUBLIC KEY END====" echo echo -e "${CYAN}3. On your local machine, set permissions for the private key:${NC}" echo -e "${CYAN} chmod 600 ~/.ssh/${USERNAME}_key${NC}" diff --git a/du_setup.sh.sha256 b/du_setup.sh.sha256 index 5448398..636dc15 100644 --- a/du_setup.sh.sha256 +++ b/du_setup.sh.sha256 @@ -1 +1 @@ -891eb9bf1e1c2b51c9ba008d330612cade70a2c929e033dbd570259fa30ff33d du_setup.sh +e41a6ffcabd4eb30673aebe096de41f8cbbc9bb5824a509e9c1c41e4845ef78f du_setup.sh