From 17085d4def6b5693b60ca13a7eacea8c4fe023a6 Mon Sep 17 00:00:00 2001 From: Roger Gonzalez Date: Thu, 26 Dec 2024 09:37:51 -0300 Subject: [PATCH] Add echo statements before log messages for clarity --- docs.org | 20 ++++++++++++++------ install.sh | 20 ++++++++++++++------ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/docs.org b/docs.org index c466544..97f8cf8 100644 --- a/docs.org +++ b/docs.org @@ -219,14 +219,18 @@ configure_media_service() { media_service_port=8096 fi - log_success "\nYAMS will install \"$media_service\" on port \"$media_service_port\"" + echo + log_success "YAMS will install \"$media_service\" on port \"$media_service_port\"" # Export for use in other functions export media_service media_service_port } configure_vpn() { - log_info "\nTime to set up the VPN." + echo + echo + echo + log_info "Time to set up the VPN." log_info "Supported VPN providers: https://yams.media/advanced/vpn" read -p "Configure VPN? (Y/n) [Default = y]: " setup_vpn @@ -240,7 +244,8 @@ configure_vpn() { read -p "VPN service? (with spaces) [$DEFAULT_VPN_SERVICE]: " vpn_service vpn_service=${vpn_service:-$DEFAULT_VPN_SERVICE} - log_info "\nPlease check $vpn_service's documentation for specific configuration:" + echo + log_info "Please check $vpn_service's documentation for specific configuration:" log_info "https://github.com/qdm12/gluetun-wiki/blob/main/setup/providers/${vpn_service// /-}.md" read -p "VPN username (without spaces): " vpn_user @@ -350,7 +355,8 @@ copy_configuration_files() { for src in "${!files[@]}"; do local dest="$install_directory/${files[$src]}" - log_info "\nCopying $src to $dest..." + echo + log_info "Copying $src to $dest..." if cp "$src" "$dest"; then log_success "$src copied successfully ✅" @@ -414,7 +420,8 @@ update_configuration_files() { } install_cli() { - log_info "\nInstalling YAMS CLI..." + echo + log_info "Installing YAMS CLI..." if sudo cp yams /usr/local/bin/yams && sudo chmod +x /usr/local/bin/yams; then log_success "YAMS CLI installed successfully ✅" else @@ -494,7 +501,8 @@ if ! docker compose -f "$install_directory/docker-compose.yaml" up -d; then fi # Install CLI and set permissions -log_info "\nWe need your sudo password to install the YAMS CLI and configure permissions..." +echo +log_info "We need your sudo password to install the YAMS CLI and configure permissions..." install_cli set_permissions diff --git a/install.sh b/install.sh index a6c5aa5..d4eb42c 100644 --- a/install.sh +++ b/install.sh @@ -152,14 +152,18 @@ configure_media_service() { media_service_port=8096 fi - log_success "\nYAMS will install \"$media_service\" on port \"$media_service_port\"" + echo + log_success "YAMS will install \"$media_service\" on port \"$media_service_port\"" # Export for use in other functions export media_service media_service_port } configure_vpn() { - log_info "\nTime to set up the VPN." + echo + echo + echo + log_info "Time to set up the VPN." log_info "Supported VPN providers: https://yams.media/advanced/vpn" read -p "Configure VPN? (Y/n) [Default = y]: " setup_vpn @@ -173,7 +177,8 @@ configure_vpn() { read -p "VPN service? (with spaces) [$DEFAULT_VPN_SERVICE]: " vpn_service vpn_service=${vpn_service:-$DEFAULT_VPN_SERVICE} - log_info "\nPlease check $vpn_service's documentation for specific configuration:" + echo + log_info "Please check $vpn_service's documentation for specific configuration:" log_info "https://github.com/qdm12/gluetun-wiki/blob/main/setup/providers/${vpn_service// /-}.md" read -p "VPN username (without spaces): " vpn_user @@ -276,7 +281,8 @@ copy_configuration_files() { for src in "${!files[@]}"; do local dest="$install_directory/${files[$src]}" - log_info "\nCopying $src to $dest..." + echo + log_info "Copying $src to $dest..." if cp "$src" "$dest"; then log_success "$src copied successfully ✅" @@ -340,7 +346,8 @@ update_configuration_files() { } install_cli() { - log_info "\nInstalling YAMS CLI..." + echo + log_info "Installing YAMS CLI..." if sudo cp yams /usr/local/bin/yams && sudo chmod +x /usr/local/bin/yams; then log_success "YAMS CLI installed successfully ✅" else @@ -401,7 +408,8 @@ if ! docker compose -f "$install_directory/docker-compose.yaml" up -d; then fi # Install CLI and set permissions -log_info "\nWe need your sudo password to install the YAMS CLI and configure permissions..." +echo +log_info "We need your sudo password to install the YAMS CLI and configure permissions..." install_cli set_permissions