@@ -130,6 +130,7 @@ function dcdown {
130130 _dc_green " All services stopped"
131131}
132132
133+ # shellcheck disable=SC2120
133134function 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 {
248250function 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 {
258261function 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 {
268272function 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
276281function 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
284290function 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 {
302309function 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
406416elif [[ -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