Skip to content

Commit f6c737b

Browse files
Copilotandrejusk
andcommitted
Refactor colored install log format - implement log functions and update all install scripts
Co-authored-by: andrejusk <[email protected]>
1 parent a4f0599 commit f6c737b

18 files changed

+56
-24
lines changed

script/install

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ set -eo pipefail
66
#
77

88
if [[ -t 1 && -n "$TERM" && "$TERM" != "dumb" ]]; then
9+
BLUE="\033[0;34m"
910
CYAN="\033[0;36m"
1011
CYAN_BOLD="\033[1;36m"
1112
RED="\033[1;31m"
@@ -14,13 +15,44 @@ if [[ -t 1 && -n "$TERM" && "$TERM" != "dumb" ]]; then
1415
GREY="\033[1;30m"
1516
NC="\033[0m"
1617
else
18+
BLUE=""
19+
CYAN=""
20+
CYAN_BOLD=""
1721
RED=""
1822
GREEN=""
1923
YELLOW=""
2024
GREY=""
2125
NC=""
2226
fi
2327

28+
# Log functions
29+
log_info() {
30+
echo -e "${BLUE}[INFO]${NC} $*"
31+
}
32+
33+
log_pass() {
34+
echo -e "${GREEN}[PASS]${NC} $*"
35+
}
36+
37+
log_warn() {
38+
echo -e "${YELLOW}[WARN]${NC} $*"
39+
}
40+
41+
log_error() {
42+
echo -e "${RED}[FAIL]${NC} $*"
43+
}
44+
45+
log_debug() {
46+
echo -e "${CYAN}$*${NC}"
47+
}
48+
49+
# Export log functions so they're available in sourced scripts
50+
export -f log_info
51+
export -f log_pass
52+
export -f log_warn
53+
export -f log_error
54+
export -f log_debug
55+
2456
printf "\n\t${CYAN} <<< ${CYAN_BOLD}dots${CYAN} >>> ${NC}\n"
2557
printf "\t${GREY}==============${NC}\n\n"
2658

script/install.d/00-os.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
1010
elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
1111
cat /etc/os-release
1212
else
13-
echo -e "${RED}Unknown OS: $OSTYPE${NC}"
13+
log_error "Unknown OS: $OSTYPE"
1414
fi

script/install.d/01-ssh.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
# skip if CODESPACES is set
99
if [ -n "$CODESPACES" ]; then
10-
echo -e "${YELLOW}Running in a GitHub Codespace${NC}"
10+
log_warn "Running in a GitHub Codespace"
1111
export SKIP_SSH_CONFIG=1
1212
fi
1313

@@ -29,5 +29,5 @@ if [ -z "$SKIP_SSH_CONFIG" ]; then
2929

3030
unset ssh_method ssh_target ssh_key ssh_pub
3131
else
32-
echo -e "${YELLOW}Skipping SSH configuration${NC}"
32+
log_warn "Skipping SSH configuration"
3333
fi

script/install.d/02-brew.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
2424
fi
2525
brew --version
2626
else
27-
echo -e "${YELLOW}Skipping: Not macOS${NC}"
27+
log_warn "Skipping: Not macOS"
2828
fi

script/install.d/03-apt.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ if command -v apt-get &> /dev/null; then
2121

2222
apt --version
2323
else
24-
echo -e "${YELLOW}Skipping: apt-get not found${NC}"
24+
log_warn "Skipping: apt-get not found"
2525
fi

script/install.d/20-docker.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88

99
# skip if in WSL
1010
if [[ -n "$WSL_DISTRO_NAME" ]]; then
11-
echo -e "${YELLOW}Running in WSL${NC}"
11+
log_warn "Running in WSL"
1212
export SKIP_DOCKER_CONFIG=1
1313
fi
1414

1515
# skip if in CODESPACES
1616
if [[ -n "$CODESPACES" ]]; then
17-
echo -e "${YELLOW}Running in GitHub Codespaces${NC}"
17+
log_warn "Running in GitHub Codespaces"
1818
export SKIP_DOCKER_CONFIG=1
1919
fi
2020

2121
# skip on mac
2222
if [[ "$OSTYPE" == "darwin"* ]]; then
23-
echo -e "${YELLOW}Running on macOS${NC}"
23+
log_warn "Running on macOS"
2424
export SKIP_DOCKER_CONFIG=1
2525
fi
2626

@@ -57,5 +57,5 @@ if [[ -z "$SKIP_DOCKER_CONFIG" ]]; then
5757
fi
5858
docker --version
5959
else
60-
echo -e "${YELLOW}Skipping Docker configuration${NC}"
60+
log_warn "Skipping Docker configuration"
6161
fi

script/install.d/30-iterm2.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
99
if ! brew list --cask iterm2 &>/dev/null; then
1010
brew install --cask iterm2
1111
fi
12-
echo -e "${GREEN}iTerm2 installed successfully!${NC}"
12+
log_pass "iTerm2 installed successfully!"
1313
else
14-
echo -e "${YELLOW}Skipping: Not macOS${NC}"
14+
log_warn "Skipping: Not macOS"
1515
fi

script/install.d/40-nerdfont.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
2020

2121
unset fonts_list
2222
else
23-
echo -e "${YELLOW}Skipping: Not macOS${NC}"
23+
log_warn "Skipping: Not macOS"
2424
fi

script/install.d/70-cca.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
1212
echo "Colour Contrast Analyser (CCA) is already installed."
1313
fi
1414
else
15-
echo -e "${YELLOW}Skipping: Not macOS${NC}"
15+
log_warn "Skipping: Not macOS"
1616
fi

script/install.d/71-rectangle.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
1212
echo "Rectangle is already installed."
1313
fi
1414
else
15-
echo -e "${YELLOW}Skipping: Not macOS${NC}"
15+
log_warn "Skipping: Not macOS"
1616
fi

0 commit comments

Comments
 (0)