From b79b7791663458f87210db28bf80f0b2d6c13960 Mon Sep 17 00:00:00 2001
From: dana <dana@dana.is>
Date: Sat, 12 Oct 2019 02:00:05 -0500
Subject: 44681 (tweaked): _composer: Eliminate questionable eval, fix quoting
 issue

---
 Completion/Unix/Command/_composer | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Completion/Unix/Command/_composer')

diff --git a/Completion/Unix/Command/_composer b/Completion/Unix/Command/_composer
index 2b9f2cd32..1cd3f3561 100644
--- a/Completion/Unix/Command/_composer
+++ b/Completion/Unix/Command/_composer
@@ -40,7 +40,7 @@ __composer_call() {
 
   __composer_update_work_dir
 
-  cmd=( ${_composer_cmd:-composer} -d${_composer_work_dir:-${(q)PWD}} )
+  cmd=( ${_composer_cmd:-composer} -d${(q)${_composer_work_dir:-$PWD}} )
   (( _composer_is_global )) && cmd+=( global )
 
   _call_program $1 $cmd "${@[2,-1]}"
@@ -115,7 +115,7 @@ __composer_prune_global_opts() {
 (( $+functions[__composer_update_work_dir] )) ||
 __composer_update_work_dir() {
   if [[ -n ${(v)opt_args[(i)(-d|--working-dir)]} ]]; then
-    eval _composer_work_dir=${(v)opt_args[(i)(-d|--working-dir)]}
+    _composer_work_dir=${(Q)${(v)opt_args[(i)(-d|--working-dir)]}}
   elif [[ -z $_composer_work_dir ]]; then
     _composer_work_dir=$PWD
   fi
-- 
cgit 1.4.1