Bernhard.Linz/openvpn-install
1
0
Fork 0
mirror of https://github.com/angristan/openvpn-install.git synced 2026-04-30 23:38:08 +02:00
Code Issues Projects Releases Wiki Activity

fix --no-color option

Browse Source
This commit is contained in:
Stanislas Lange
2026-04-30 14:15:07 +02:00
committed by Stanislas
parent 63448d542d
commit 3502aec0b7
2 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
openvpn-install.sh
View File

@@ -22,25 +22,26 @@ VERBOSE=${VERBOSE:-0}
LOG_FILE=${LOG_FILE:-openvpn-install.log} LOG_FILE=${LOG_FILE:-openvpn-install.log}
OUTPUT_FORMAT=${OUTPUT_FORMAT:-table} # table or json - json suppresses log output OUTPUT_FORMAT=${OUTPUT_FORMAT:-table} # table or json - json suppresses log output
# Color definitions (disabled if not a terminal, unless FORCE_COLOR=1) # Color definitions (disabled if not a terminal, unless FORCE_COLOR=1).
# Keep these mutable so --no-color can disable colors after startup.
if [[ -t 1 ]] || [[ $FORCE_COLOR == "1" ]]; then if [[ -t 1 ]] || [[ $FORCE_COLOR == "1" ]]; then
readonly COLOR_RESET='\033[0m' COLOR_RESET='\033[0m'
readonly COLOR_RED='\033[0;31m' COLOR_RED='\033[0;31m'
readonly COLOR_GREEN='\033[0;32m' COLOR_GREEN='\033[0;32m'
readonly COLOR_YELLOW='\033[0;33m' COLOR_YELLOW='\033[0;33m'
readonly COLOR_BLUE='\033[0;34m' COLOR_BLUE='\033[0;34m'
readonly COLOR_CYAN='\033[0;36m' COLOR_CYAN='\033[0;36m'
readonly COLOR_DIM='\033[0;90m' COLOR_DIM='\033[0;90m'
readonly COLOR_BOLD='\033[1m' COLOR_BOLD='\033[1m'
else else
readonly COLOR_RESET='' COLOR_RESET=''
readonly COLOR_RED='' COLOR_RED=''
readonly COLOR_GREEN='' COLOR_GREEN=''
readonly COLOR_YELLOW='' COLOR_YELLOW=''
readonly COLOR_BLUE='' COLOR_BLUE=''
readonly COLOR_CYAN='' COLOR_CYAN=''
readonly COLOR_DIM='' COLOR_DIM=''
readonly COLOR_BOLD='' COLOR_BOLD=''
fi fi
# Write to log file (no colors, with timestamp) # Write to log file (no colors, with timestamp)

10
test/server-entrypoint.sh
View File

@@ -16,6 +16,16 @@ echo "TUN device ready"
export FORCE_COLOR=1 export FORCE_COLOR=1
VPN_SUBNET_IPV4=10.9.0.0 # Custom subnet to test configurability VPN_SUBNET_IPV4=10.9.0.0 # Custom subnet to test configurability
echo "Testing --no-color help output..."
NO_COLOR_OUTPUT="/tmp/no-color-help.log"
/opt/openvpn-install.sh --no-color --help >"$NO_COLOR_OUTPUT"
if grep -q $'\033' "$NO_COLOR_OUTPUT"; then
echo "FAIL: --no-color help output contains ANSI escape sequences"
cat "$NO_COLOR_OUTPUT"
exit 1
fi
echo "PASS: --no-color help output has no ANSI escape sequences"
# Calculate VPN gateway from subnet (first usable IP) # Calculate VPN gateway from subnet (first usable IP)
VPN_GATEWAY="${VPN_SUBNET_IPV4%.*}.1" VPN_GATEWAY="${VPN_SUBNET_IPV4%.*}.1"
export VPN_GATEWAY export VPN_GATEWAY