Fixes issue where bash paths were not correctly deconstructed, leading to unit tests failing when the path had a space in it
This commit is contained in:
committed by
Tomas Babej
parent
5f39b368b6
commit
9be55fc070
@@ -60,8 +60,10 @@ def prepare_tasksh(t):
|
||||
for line in fh:
|
||||
line = line.rstrip()
|
||||
|
||||
if line == "taskcommand='task rc.verbose:nothing rc.confirmation:no rc.hooks:off'":
|
||||
line = "taskcommand='{0} rc.verbose:nothing rc.confirmation:no rc.hooks:off rc:{1}'".format(t.taskw, t.taskrc)
|
||||
if line == "taskbin='task'":
|
||||
line = "taskbin='{0}'".format(t.taskw)
|
||||
if line == "taskrc=''":
|
||||
line = "taskrc='rc:{0}'".format(t.taskrc)
|
||||
|
||||
tasksh.append(line)
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ function find_task_binary {
|
||||
for t in "${bashtap_org_pwd}/task" "${bashtap_org_pwd}/src/task" "${bashtap_org_pwd}/../task" "${bashtap_org_pwd}/../src/task" "${bashtap_org_pwd}/../build/src/task"; do
|
||||
if [ -f "$t" ] && [ -x "$t" ]; then
|
||||
t_abs=$(bashtap_get_absolute_path "$t")
|
||||
eval "function task { ${t_abs} rc:taskrc \"\$@\"; }"
|
||||
eval "function task { '${t_abs}' rc:taskrc \"\$@\"; }"
|
||||
return 0
|
||||
fi
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user