diff --git a/rpi/first-boot-wizard.sh b/rpi/first-boot-wizard.sh index b0b6eb8..30bd363 100755 --- a/rpi/first-boot-wizard.sh +++ b/rpi/first-boot-wizard.sh @@ -30,14 +30,21 @@ clear echo -e "${CYAN}" cat << 'BANNER' - _____ _ - / ____| | - | (___ | |_ ___ __ _ __ _ ___ ___ ___ - \___ \| __/ _ \/ _` |/ _` / __|/ _ \ / _ \ - ____) | || __/ (_| | (_| \__ \ (_) | (_) | - |_____/ \__\___|\__, |\__,_|___/\___/ \___/ - __/ | - |___/ First Boot Wizard + + · . · . · . · . · . · . · . · . · . · . · . · . · . · . · · + . · . · . · . · . · . · . · . · . · . · . · . · . · . · . . + · . · . · . · . · /\ · . · /\ · . · /\ · . · /\ · . · . · · + . · . · . · . · ./ \· . ./ \· . ./ \· . ./ \. · . · . . + · . · . · . · . · \/ · . · \/ · . · \/ · . · \/ · . · . · · + · . · . · . · . · . · . · . · . · . · . · . · . · . · . · · + . ___ _____ ___ ___ _ ___ ___ ___ · . · . . + · / __||_ _|| __| / __| /_\ / __| / _ \ / _ \ · . · . · + . \__ \ | | | _| | (_ | / _ \ \__ \| (_) || (_) |. · . · . + · |___/ |_| |___| \___|/_/ \_\|___/ \___/ \___/ · . · . · + . · . · . · . · . · . · . · . · . · . · . · . · . · . · . . + · . · . · . · . · . · . · . · . · . · . · . · . · . · . · · + . · ~~~~ · . · . · First Boot Wizard · . · . · ~~~~ · . · . + · . tail · . · . · . · . · . · . · . · . · . · head · . · · BANNER echo -e "${NC}" @@ -62,9 +69,8 @@ CHANNEL_KEY="" # ============================================================================= clear -echo -e "${BLUE}╔═══════════════════════════════════════════════════════════════╗${NC}" -echo -e "${BLUE}║${NC} ${BOLD}Step 1 of 3: HTTPS Configuration${NC} ${BLUE}║${NC}" -echo -e "${BLUE}╚═══════════════════════════════════════════════════════════════╝${NC}" +echo -e "${BOLD}Step 1 of 3: HTTPS Configuration${NC}" +echo -e "${BLUE}-------------------------------------------------------${NC}" echo "" echo "HTTPS encrypts all traffic between your browser and this server" echo "using a self-signed certificate." @@ -90,9 +96,8 @@ fi if [ "$ENABLE_HTTPS" = "true" ]; then clear - echo -e "${BLUE}╔═══════════════════════════════════════════════════════════════╗${NC}" - echo -e "${BLUE}║${NC} ${BOLD}Step 2 of 3: Port Configuration${NC} ${BLUE}║${NC}" - echo -e "${BLUE}╚═══════════════════════════════════════════════════════════════╝${NC}" + echo -e "${BOLD}Step 2 of 3: Port Configuration${NC}" + echo -e "${BLUE}-------------------------------------------------------${NC}" echo "" echo "The standard HTTPS port is 443, which means you can access" echo "Stegasoo without specifying a port in the URL." @@ -120,9 +125,8 @@ fi # ============================================================================= clear -echo -e "${BLUE}╔═══════════════════════════════════════════════════════════════╗${NC}" -echo -e "${BLUE}║${NC} ${BOLD}Step 3 of 3: Channel Key Configuration${NC} ${BLUE}║${NC}" -echo -e "${BLUE}╚═══════════════════════════════════════════════════════════════╝${NC}" +echo -e "${BOLD}Step 3 of 3: Channel Key Configuration${NC}" +echo -e "${BLUE}-------------------------------------------------------${NC}" echo "" echo "A channel key creates a private encoding channel." echo "" @@ -151,11 +155,9 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then echo "" echo -e " ${BOLD}${YELLOW}$CHANNEL_KEY${NC}" echo "" - echo -e " ${RED}╔═══════════════════════════════════════════════════════════╗${NC}" - echo -e " ${RED}║ IMPORTANT: Write down or copy this key NOW! ║${NC}" - echo -e " ${RED}║ You'll need to share it with anyone who should decode ║${NC}" - echo -e " ${RED}║ your images. This key won't be shown again. ║${NC}" - echo -e " ${RED}╚═══════════════════════════════════════════════════════════╝${NC}" + echo -e " ${RED}*** IMPORTANT: Write down or copy this key NOW! ***${NC}" + echo -e " ${RED}You'll need to share it with anyone who should decode${NC}" + echo -e " ${RED}your images. This key won't be shown again.${NC}" echo "" read -p "Press Enter when you've saved the key..." else @@ -173,9 +175,8 @@ fi # ============================================================================= clear -echo -e "${BLUE}╔═══════════════════════════════════════════════════════════════╗${NC}" -echo -e "${BLUE}║${NC} ${BOLD}Applying Configuration...${NC} ${BLUE}║${NC}" -echo -e "${BLUE}╚═══════════════════════════════════════════════════════════════╝${NC}" +echo -e "${BOLD}Applying Configuration...${NC}" +echo -e "${BLUE}-------------------------------------------------------${NC}" echo "" # Find the stegasoo user (whoever owns the install dir) diff --git a/rpi/sanitize-for-image.sh b/rpi/sanitize-for-image.sh index b282883..832bc73 100755 --- a/rpi/sanitize-for-image.sh +++ b/rpi/sanitize-for-image.sh @@ -35,24 +35,22 @@ if [ "$EUID" -ne 0 ]; then exit 1 fi +BOLD='\033[1m' + if [ "$SOFT_RESET" = true ]; then - echo -e "${CYAN}" - echo "+-----------------------------------------------------------------+" - echo "| Soft Reset (Factory Defaults) |" - echo "| |" - echo "| WiFi credentials will be KEPT for continued testing. |" - echo "| Everything else will be reset to first-boot state. |" - echo "+-----------------------------------------------------------------+" - echo -e "${NC}" + echo "" + echo -e "${BOLD}Soft Reset (Factory Defaults)${NC}" + echo -e "${CYAN}-------------------------------------------------------${NC}" + echo " WiFi credentials will be KEPT for continued testing." + echo " Everything else will be reset to first-boot state." + echo "" else - echo -e "${YELLOW}" - echo "+-----------------------------------------------------------------+" - echo "| Sanitize Pi for Image Distribution |" - echo "| |" - echo "| This will remove ALL personal data for imaging. |" - echo "| The system will shut down when complete. |" - echo "+-----------------------------------------------------------------+" - echo -e "${NC}" + echo "" + echo -e "${BOLD}Sanitize Pi for Image Distribution${NC}" + echo -e "${YELLOW}-------------------------------------------------------${NC}" + echo " This will remove ALL personal data for imaging." + echo " The system will shut down when complete." + echo "" fi read -p "Continue? This cannot be undone! [y/N] " -n 1 -r @@ -327,15 +325,13 @@ fi # ============================================================================= echo "" if [ $VALIDATION_ERRORS -eq 0 ]; then - echo -e "${GREEN}+-----------------------------------------------------------------+${NC}" - echo -e "${GREEN}| Sanitization Complete! |${NC}" - echo -e "${GREEN}| All validation checks passed. |${NC}" - echo -e "${GREEN}+-----------------------------------------------------------------+${NC}" + echo -e "${BOLD}Sanitization Complete!${NC}" + echo -e "${GREEN}-------------------------------------------------------${NC}" + echo -e " ${GREEN}All validation checks passed.${NC}" else - echo -e "${RED}+-----------------------------------------------------------------+${NC}" - echo -e "${RED}| Sanitization Complete with Errors |${NC}" - echo -e "${RED}| $VALIDATION_ERRORS validation check(s) failed |${NC}" - echo -e "${RED}+-----------------------------------------------------------------+${NC}" + echo -e "${BOLD}Sanitization Complete with Errors${NC}" + echo -e "${RED}-------------------------------------------------------${NC}" + echo -e " ${RED}$VALIDATION_ERRORS validation check(s) failed${NC}" fi echo "" diff --git a/rpi/setup.sh b/rpi/setup.sh index 4e49e1a..31b0887 100755 --- a/rpi/setup.sh +++ b/rpi/setup.sh @@ -24,6 +24,7 @@ RED='\033[0;31m' GREEN='\033[0;32m' YELLOW='\033[1;33m' BLUE='\033[0;34m' +BOLD='\033[1m' NC='\033[0m' # No Color # Configuration @@ -32,14 +33,12 @@ PYTHON_VERSION="3.12" STEGASOO_REPO="https://github.com/adlee-was-taken/stegasoo.git" JPEGIO_REPO="https://github.com/dwgoon/jpegio.git" -echo -e "${BLUE}" -echo "╔═══════════════════════════════════════════════════════════════╗" -echo "║ Stegasoo Raspberry Pi Setup Script ║" -echo "║ ║" -echo "║ This will install Stegasoo with full DCT support ║" -echo "║ Estimated time: 15-20 minutes on Pi 5 ║" -echo "╚═══════════════════════════════════════════════════════════════╝" -echo -e "${NC}" +echo "" +echo -e "${BOLD}Stegasoo Raspberry Pi Setup${NC}" +echo -e "${BLUE}-------------------------------------------------------${NC}" +echo " This will install Stegasoo with full DCT support" +echo " Estimated time: 15-20 minutes on Pi 5" +echo "" # Check if running on ARM ARCH=$(uname -m) @@ -206,9 +205,8 @@ sudo systemctl daemon-reload sudo systemctl enable stegasoo.service echo "" -echo -e "${BLUE}╔═══════════════════════════════════════════════════════════════╗${NC}" -echo -e "${BLUE}║${NC} ${GREEN}Installation Complete!${NC} ${BLUE}║${NC}" -echo -e "${BLUE}╚═══════════════════════════════════════════════════════════════╝${NC}" +echo -e "${BOLD}Installation Complete!${NC}" +echo -e "${BLUE}-------------------------------------------------------${NC}" echo "" echo -e "Stegasoo installed to: ${YELLOW}$INSTALL_DIR${NC}" echo "" @@ -217,9 +215,8 @@ echo "" # Interactive Configuration # ============================================================================= -echo -e "${BLUE}╔═══════════════════════════════════════════════════════════════╗${NC}" -echo -e "${BLUE}║${NC} ${YELLOW}Configuration${NC} ${BLUE}║${NC}" -echo -e "${BLUE}╚═══════════════════════════════════════════════════════════════╝${NC}" +echo -e "${BOLD}Configuration${NC}" +echo -e "${BLUE}-------------------------------------------------------${NC}" echo "" # Track configuration choices @@ -342,9 +339,8 @@ sudo systemctl daemon-reload # ============================================================================= echo "" -echo -e "${BLUE}╔═══════════════════════════════════════════════════════════════╗${NC}" -echo -e "${BLUE}║${NC} ${GREEN}Setup Complete!${NC} ${BLUE}║${NC}" -echo -e "${BLUE}╚═══════════════════════════════════════════════════════════════╝${NC}" +echo -e "${BOLD}Setup Complete!${NC}" +echo -e "${BLUE}-------------------------------------------------------${NC}" echo "" PI_IP=$(hostname -I | awk '{print $1}')