Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat logs #36

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
**/tmp
**/logs
**/.env
**/.env.old
/docker-compose.yml
Expand Down
14 changes: 7 additions & 7 deletions config/config.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/bin/bash

export GLD_dotfiles=(
export core__dotfiles=(
"aliases"
"functions"
)

export GLD_apt_packages=(
export core__apt_packages=(
"apt-transport-https"
"build-essential"
"ca-certificates"
Expand All @@ -24,7 +24,7 @@ export GLD_apt_packages=(
"zsh"
)

export GLD_snap_packages=(
export core__snap_packages=(
"code --classic"
"discord"
"gimp"
Expand All @@ -35,25 +35,25 @@ export GLD_snap_packages=(
"vlc"
)

export GLD_brew_formulaes=(
export core__brew_formulaes=(
"thefuck"
)

export GLD_brew_k8s_formulaes=(
export core__brew_k8s_formulaes=(
"kubectl"
"kubectx"
"kubeseal"
"helm"
)

export GLD_omz_plugins=(
export core__omz_plugins=(
"zsh-autosuggestions"
"zsh-completions"
"zsh-history-substring-search"
"zsh-syntax-highlighting"
)

export GLD_vscode_extensions=(
export core__vscode_extensions=(
"ms-azuretools.vscode-docker"
"dracula-theme.theme-dracula"
"eamodio.gitlens"
Expand Down
14 changes: 7 additions & 7 deletions config/ui.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/bin/bash

ui_error() { echo -e "\e[31m[x] $*.\e[0m"; }
ui_wip() { echo -e "\e[33m[-] $*...\e[0m"; }
ui_success() { echo -e "\e[32m[v] $* !\e[0m"; }
ui_info() { echo -e "\e[34m[?] $*;\e[0m"; }
ui_cmd() { echo -e "\e[1;30;107m[$] $*\e[0m"; }
core__ui_error() { echo -e "\e[31m[x] $*.\e[0m"; }
core__ui_wip() { echo -e "\e[33m[-] $*...\e[0m"; }
core__ui_success() { echo -e "\e[32m[v] $* !\e[0m"; }
core__ui_info() { echo -e "\e[34m[?] $*;\e[0m"; }
core__ui_cmd() { echo -e "\e[1;30;107m[$] $*\e[0m"; }

ui_start() { ui_wip "starting the action"; sleep 1; }
ui_done() { ui_success "action done"; sleep 2; }
core__ui_start() { core__ui_wip "starting the action"; sleep 1; }
core__ui_done() { core__ui_success "action done"; sleep 2; }
67 changes: 49 additions & 18 deletions config/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,54 +3,85 @@
# shellcheck source=/dev/null
source "$PWD"/config/config.sh

function GLD_apt_packages_install () {
function foo () {
echo "bar"
}

function core__log_cmd () {
if [[ ! -d "logs/" ]]; then
core__ui_info "/logs folder not found; creating"
mkdir "logs"
fi
date_format='+%Y-%m-%dT%H:%M:%S.%3NZ'
logfile="logs/GLD-$(date '+%Y-%m-%d').log"
exit_code=$1
cmd=$2
if [[ exit_code -ne 0 ]] ; then
message="$(date $date_format) - FAIL [$exit_code] \"$cmd\""
else
message="$(date $date_format) - INFO \"$cmd\""
fi
echo "$message" >> "$logfile"
}



function core__install__apt_packages () {
ARRAY=$*
for i in $ARRAY; do
if ! command -v "$i" &> /dev/null; then
ui_info "installing \"$i\" binary"
core__ui_info "installing \"$i\" binary"
exec=(sudo apt install "$i" -y)
else
ui_info "upgrade \"$i\" binary because already exist"
core__ui_info "upgrade \"$i\" binary because already exist"
exec=(sudo apt upgrade "$i" -y)
fi
ui_cmd "${exec[@]}" ; "${exec[@]}"
core__ui_cmd "${exec[@]}" ; "${exec[@]}"
exit_code=$?
core__log_cmd $exit_code "${exec[*]}"
done
}

function GLD_brew_formulaes_install () {
function core__brew_formulaes_install () {
ARRAY=$*
for i in $ARRAY; do
if ! command -v "$i" &> /dev/null; then
ui_info "installing \"$i\" binary"
core__ui_info "installing \"$i\" binary"
exec=(brew install "$i")
else
ui_info "upgrade \"$i\" binary because already exist"
core__ui_info "upgrade \"$i\" binary because already exist"
exec=(brew upgrade "$i")
fi
ui_cmd "${exec[@]}" ; "${exec[@]}"
core__ui_cmd "${exec[@]}" ; "${exec[@]}"
exit_code=$?
core__log_cmd $exit_code "${exec[*]}"
done
}

function GLD_snap_packages_install () {
function core__snap_packages_install () {

for ((i = 0; i < ${#GLD_snap_packages[@]}; i++)) ; do
if ! command -v "${GLD_snap_packages[$i]}" &> /dev/null; then
ui_info "installing \"${GLD_snap_packages[$i]}\" binary"
exec=(sudo snap install "${GLD_snap_packages[$i]}")
for ((i = 0; i < ${#core__snap_packages[@]}; i++)) ; do
if ! command -v "${core__snap_packages[$i]}" &> /dev/null; then
core__ui_info "installing \"${core__snap_packages[$i]}\" binary"
exec=(sudo snap install "${core__snap_packages[$i]}")
else
ui_info "upgrade \"${GLD_snap_packages[$i]}\" binary because already exist"
exec=(sudo snap refresh "${GLD_snap_packages[$i]}")
core__ui_info "upgrade \"${core__snap_packages[$i]}\" binary because already exist"
exec=(sudo snap refresh "${core__snap_packages[$i]}")
fi
ui_cmd "${exec[@]}" ; "${exec[@]}"
core__ui_cmd "${exec[@]}" ; "${exec[@]}"
exit_code=$?
core__log_cmd $exit_code "${exec[*]}"
done
}

function GLD_vscode_extensions_install () {
function core__vscode_extensions_install () {
ARRAY=$*
for i in $ARRAY; do
if ! command -v "$i" &> /dev/null; then
exec=(code --install-extension "$i")
fi
ui_cmd "${exec[@]}" ; "${exec[@]}"
core__ui_cmd "${exec[@]}" ; "${exec[@]}"
exit_code=$?
core__log_cmd $exit_code "${exec[*]}"
done
}
6 changes: 3 additions & 3 deletions exec/apt/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ source "$PWD"/config/ui.sh
source "$PWD"/config/config.sh
source "$PWD"/config/utils.sh

ui_start
core__ui_start

GLD_apt_packages_install "${GLD_apt_packages[@]}"
core__install__apt_packages "${core__apt_packages[@]}"

ui_done
core__ui_done
13 changes: 9 additions & 4 deletions exec/apt/update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,14 @@ source "$PWD"/config/utils.sh
exec_a=(sudo apt update -y)
exec_b=(sudo apt upgrade -y)

ui_start
core__ui_start

ui_cmd "${exec_a[@]}" ; "${exec_a[@]}"
ui_cmd "${exec_b[@]}" ; "${exec_b[@]}"
core__ui_cmd "${exec_a[@]}"; "${exec_a[@]}"
exit_code=$?
core__log_cmd $exit_code "${exec_a[*]}"

ui_done
core__ui_cmd "${exec_b[@]}"; "${exec_b[@]}"
exit_code=$?
core__log_cmd $exit_code "${exec_b[*]}"

core__ui_done
19 changes: 17 additions & 2 deletions exec/brew/binary.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,18 @@ ui_start
if ! command -v brew &> /dev/null; then
ui_info "installing brew executable"
ui_cmd "${exec_install[@]}" ; NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
exit_code=$?
log_cmd $exit_code "${exec_install[*]}"

if [ -f "$HOME"/.zshrc ]; then
ui_info "$HOME/.zshrc detected"
ui_info "$HOME/.zshrc detected"
if ! grep -q "${exec_env[@]}" < "$HOME"/.zshrc ; then
ui_info "dotfile sourcing not found"
ui_cmd "${exec_env[*]} >> $HOME/.zshrc" ; printf "\n\n%s\n$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" >> "$HOME"/.zshrc
ui_cmd "${exec_env[*]} >> $HOME/.zshrc"
printf "\n\n%s\n$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" >> "$HOME"/.zshrc
exit_code=$?
log_cmd $exit_code "${exec_env[*]}"

else
ui_info "sourcing already found, terminating"
fi
Expand All @@ -36,7 +43,15 @@ ui_info "setting env vars"
eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv)

ui_cmd "${exec_a[@]}" ; "${exec_a[@]}"
exit_code=$?
log_cmd $exit_code "${exec_a[*]}"

ui_cmd "${exec_b[@]}" ; "${exec_b[@]}"
exit_code=$?
log_cmd $exit_code "${exec_b[*]}"

ui_cmd "${exec_c[@]}" ; "${exec_c[@]}"
exit_code=$?
log_cmd $exit_code "${exec_c[*]}"

ui_done
17 changes: 11 additions & 6 deletions exec/dotfiles/dotfiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,23 @@ source "$PWD"/config/ui.sh
source "$PWD"/config/config.sh
source "$PWD"/config/utils.sh

ui_start
core__ui_start

for i in "${GLD_dotfiles[@]}"
for i in "${core__dotfiles[@]}"
do
file="$HOME/.$i"
exec_a=(mv "$HOME"/."$i" "$HOME"/."$i".old)
exec_b=(cp "$PWD"/config/files/"$i".sh "$HOME"/."$i")
if [ -f "$file" ]; then
ui_info "$file already exists, creating old version"
ui_cmd "${exec_a[@]}" ; "${exec_a[@]}"
core__ui_info "$file already exists, creating old version"

core__ui_cmd "${exec_a[@]}"; "${exec_a[@]}"
exit_code=$?
core__log_cmd $exit_code "${exec_a[*]}"
fi
ui_cmd "${exec_b[@]}" ; "${exec_b[@]}"
core__ui_cmd "${exec_b[@]}"; "${exec_b[@]}"
exit_code=$?
core__log_cmd $exit_code "${exec_b[*]}"
done

ui_done
core__ui_done
23 changes: 13 additions & 10 deletions exec/dotfiles/rcfiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,25 @@ source "$PWD"/config/ui.sh
source "$PWD"/config/config.sh
source "$PWD"/config/utils.sh

ui_start
core__ui_start

sourcing="source $HOME/.aliases; source $HOME/.functions"
exec="printf source $HOME/.aliases; source $HOME/.functions >> $HOME/.zshrc "


if [ -f "$HOME"/.zshrc ]; then
ui_info "$HOME/.zshrc detected"
if ! grep -q "$sourcing" < "$HOME"/.zshrc ; then
ui_info "dotfile sourcing not found"
ui_cmd "$sourcing >> $HOME/.zshrc"
printf "\n%s\n" "$sourcing" >> "$HOME"/.zshrc
core__ui_info "$HOME/.zshrc detected"
if ! grep -q "$exec" < "$HOME"/.zshrc ; then
core__ui_info "dotfile sourcing not found"
core__ui_cmd "printf \"$exec\" >> $HOME/.zshrc" ; printf "\n%s\n" "$exec" >> "$HOME"/.zshrc

exit_code=$?
core__log_cmd $exit_code "printf \"$exec\" >> $HOME/.zshrc"
# printf "\n%s\n" "$exec" >> "$HOME"/.zshrc
else
ui_info "sourcing already found, terminating"
core__ui_info "sourcing already found, terminating"
fi
else
ui_error "$HOME/.zshrc not found"
core__ui_error "$HOME/.zshrc not found"
fi

ui_done
core__ui_done
7 changes: 3 additions & 4 deletions exec/snap/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ source "$PWD"/config/ui.sh
source "$PWD"/config/config.sh
source "$PWD"/config/utils.sh

ui_start
core__ui_start

core__snap_packages_install

GLD_snap_packages_install

ui_done
core__ui_done
15 changes: 11 additions & 4 deletions exec/snap/refresh.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,17 @@ source "$PWD"/config/ui.sh
source "$PWD"/config/config.sh
source "$PWD"/config/utils.sh

exec=(sudo snap refresh)
exec_a=(killall snap-store)
exec_b=(sudo snap refresh)

ui_start
core__ui_start

ui_cmd "${exec[@]}" ; "${exec[@]}"
core__ui_cmd "${exec_a[@]}"; "${exec_a[@]}"
exit_code=$?
core__log_cmd $exit_code "${exec_a[*]}"

ui_done
core__ui_cmd "${exec_b[@]}"; "${exec_b[@]}"
exit_code=$?
core__log_cmd $exit_code "${exec_b[*]}"

core__ui_done
6 changes: 3 additions & 3 deletions exec/vscode/extensions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ source "$PWD"/config/ui.sh
source "$PWD"/config/config.sh
source "$PWD"/config/utils.sh

ui_start
core__ui_start

GLD_vscode_extensions_install "${GLD_vscode_extensions[@]}"
core__vscode_extensions_install "${core__vscode_extensions[@]}"

ui_done
core__ui_done
11 changes: 6 additions & 5 deletions exec/vscode/settings.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ source "$PWD"/config/ui.sh
source "$PWD"/config/config.sh
source "$PWD"/config/utils.sh

exec_a=(cp "$PWD"/config/files/vscode-settings.json "$HOME"/.config/Code/User/settings.json)
exec=(cp "$PWD"/config/files/vscode-settings.json "$HOME"/.config/Code/User/settings.json)

ui_start
core__ui_start

ui_cmd "${exec_a[@]}" ; "${exec_a[@]}"
ui_cmd "${exec_b[@]}" ; "${exec_b[@]}"
ui_done
core__ui_cmd "${exec[@]}"; "${exec[@]}"
exit_code=$?
core__log_cmd $exit_code "${exec[*]}"

core__ui_done
Loading