Skip to content

Commit fd48676

Browse files
committed
fix: resolve shellcheck warnings and cleanup
- .bash_aliases: add shell directive, replace aliases using positional params with functions, remove command-substitution aliases (SC2142) - docker_aliases.sh: separate local declarations from assignments (SC2155), suppress zsh-specific syntax warnings (SC2296/SC2206) - shellcheck.yml: restrict to main branch, add .bash_aliases to paths - Remove leftover renovate.json (standardized on Dependabot)
1 parent 2e80c4c commit fd48676

File tree

3 files changed

+29
-15
lines changed

3 files changed

+29
-15
lines changed

.bash_aliases

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# shellcheck shell=bash
12
# General System Utilities
23
alias c='clear'
34
alias gh='history | grep'
@@ -32,15 +33,12 @@ alias speed='speedtest-cli --server 2406 --simple'
3233
alias dcdown='docker compose down'
3334
alias dcup='docker compose up'
3435
alias dexec='docker exec -it'
35-
alias dockerclean='docker rm $(docker ps -a -q)'
3636
alias dockerdu='docker system df'
3737
alias dockerls='docker ps -a'
38-
alias docker-rmi-untagged='docker rmi $(docker images | grep "^<none>" | awk "{print \$3}")'
39-
alias dockerstopall='docker stop $(docker ps -a -q)'
4038
alias dlogs='docker logs'
4139

4240
# Development and Git
43-
alias startgit='cd `git rev-parse --show-toplevel` && git checkout master && git pull'
41+
startgit() { cd "$(git rev-parse --show-toplevel)" && git checkout master && git pull; }
4442

4543
# File Management
4644
alias rmrf='rm -rf' # Use with caution

.github/workflows/shellcheck.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@ name: ShellCheck
22

33
on:
44
push:
5+
branches: [main]
56
paths:
67
- "**/*.sh"
8+
- ".bash_aliases"
79
pull_request:
810
paths:
911
- "**/*.sh"
12+
- ".bash_aliases"
1013

1114
jobs:
1215
shellcheck:

docker_aliases.sh

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ function dcdown {
130130
_dc_green "All services stopped"
131131
}
132132

133+
# shellcheck disable=SC2120
133134
function dcpull {
134135
_dc_init || return 1
135136
local images
@@ -180,7 +181,8 @@ function dcup {
180181
_dc_compose up -d
181182
else
182183
services="$*"
183-
local total=$(echo "$services" | wc -w)
184+
local total
185+
total=$(echo "$services" | wc -w)
184186
local count=0
185187
for svc in $services; do
186188
((count++))
@@ -248,7 +250,8 @@ function dcq {
248250
function grpdown {
249251
local grp=$1; shift
250252
_dc_init || return 1
251-
local services=$(_dc_group "$grp")
253+
local services
254+
services=$(_dc_group "$grp")
252255
[[ -z "$services" ]] && { _dc_red "No services in group: $grp"; return 1; }
253256
_dc_blue "Stopping $grp: $services"
254257
_dc_compose stop $services "$@"
@@ -258,7 +261,8 @@ function grpdown {
258261
function grpup {
259262
local grp=$1; shift
260263
_dc_init || return 1
261-
local services=$(_dc_group "$grp")
264+
local services
265+
services=$(_dc_group "$grp")
262266
[[ -z "$services" ]] && { _dc_red "No services in group: $grp"; return 1; }
263267
_dc_blue "Starting $grp: $services"
264268
_dc_compose up -d $services "$@"
@@ -268,23 +272,26 @@ function grpup {
268272
function grplogs {
269273
local grp=$1; shift
270274
_dc_init || return 1
271-
local services=$(_dc_group "$grp")
275+
local services
276+
services=$(_dc_group "$grp")
272277
[[ -z "$services" ]] && { _dc_red "No services in group: $grp"; return 1; }
273278
_dc_compose logs -f $services "$@"
274279
}
275280

276281
function grpps {
277282
local grp=$1; shift
278283
_dc_init || return 1
279-
local services=$(_dc_group "$grp")
284+
local services
285+
services=$(_dc_group "$grp")
280286
[[ -z "$services" ]] && { _dc_red "No services in group: $grp"; return 1; }
281287
_dc_compose ps $services "$@"
282288
}
283289

284290
function grprestart {
285291
local grp=$1; shift
286292
_dc_init || return 1
287-
local services=$(_dc_group "$grp")
293+
local services
294+
services=$(_dc_group "$grp")
288295
[[ -z "$services" ]] && { _dc_red "No services in group: $grp"; return 1; }
289296
_dc_blue "Restarting $grp: $services"
290297
_dc_compose restart $services "$@"
@@ -302,7 +309,8 @@ function grplist {
302309
function grpshow {
303310
local grp=$1
304311
_dc_init || return 1
305-
local services=$(_dc_group "$grp")
312+
local services
313+
services=$(_dc_group "$grp")
306314
[[ -z "$services" ]] && { _dc_red "No services in group: $grp"; return 1; }
307315
echo "$grp: $services"
308316
}
@@ -397,17 +405,22 @@ if [[ -n "$BASH_VERSION" ]]; then
397405
_dc_services() {
398406
local cur="${COMP_WORDS[COMP_CWORD]}"
399407
local services
400-
[[ -z "$COMPOSE_FILE" ]] && [[ -f "$DOCKER_GIT_DIR/.env" ]] && \
401-
export COMPOSE_FILE=$(grep '^COMPOSE_FILE=' "$DOCKER_GIT_DIR/.env" 2>/dev/null | cut -d= -f2-)
408+
if [[ -z "$COMPOSE_FILE" ]] && [[ -f "$DOCKER_GIT_DIR/.env" ]]; then
409+
COMPOSE_FILE=$(grep '^COMPOSE_FILE=' "$DOCKER_GIT_DIR/.env" 2>/dev/null | cut -d= -f2-)
410+
export COMPOSE_FILE
411+
fi
402412
mapfile -t services < <(_dc_plain config --services 2>/dev/null)
403413
mapfile -t COMPREPLY < <(compgen -W "${services[*]}" -- "$cur")
404414
}
405415
complete -F _dc_services dclogs dcexec dcrecreate dcrs dc
406416
elif [[ -n "$ZSH_VERSION" ]]; then
407417
_dc_services() {
408418
local services
409-
[[ -z "$COMPOSE_FILE" ]] && [[ -f "$DOCKER_GIT_DIR/.env" ]] && \
410-
export COMPOSE_FILE=$(grep '^COMPOSE_FILE=' "$DOCKER_GIT_DIR/.env" 2>/dev/null | cut -d= -f2-)
419+
if [[ -z "$COMPOSE_FILE" ]] && [[ -f "$DOCKER_GIT_DIR/.env" ]]; then
420+
COMPOSE_FILE=$(grep '^COMPOSE_FILE=' "$DOCKER_GIT_DIR/.env" 2>/dev/null | cut -d= -f2-)
421+
export COMPOSE_FILE
422+
fi
423+
# shellcheck disable=SC2296,SC2206
411424
services=(${(f)"$(_dc_plain config --services 2>/dev/null)"})
412425
_describe 'service' services
413426
}

0 commit comments

Comments
 (0)