Skip to content
Snippets Groups Projects
Commit 1bdbf601 authored by Wei Liu's avatar Wei Liu
Browse files

Fixed: relative path did not work

parent 37d6bcd7
Branches
Tags
No related merge requests found
......@@ -127,16 +127,10 @@ fi
COMMAND="${COMMAND} :download <"
for ns in "${NAMESPACES[@]}"
do
if [[ "${ns}" =~ ^${NAMESPACE_ROOT}/.* ]]; then
path=${ns#$NAMESPACE_ROOT/} # remove leading root namespace
IFS='/' read -r -a array <<< "${path}"
prj="${array[0]}"
else
path=${ns#*/} # remove leading slash
IFS='/' read -r -a array <<< "${path}"
prj="${array[0]}"
ns="${NAMESPACE_ROOT}/${path}" # get full path of the namespace
fi
prj=$(echo $ns | sed -n 's/.*\/\(proj-[^\/]*\)\/.*/\1/p')
[[ -z "${prj}" ]] && prj=$(echo $ns | sed -n 's/^\(proj-[^\/]*\)\/.*/\1/p')
[[ -z "${prj}" ]] && echo "Failed to resolve project id from path: ${ns}" && exit 1
if [[ -z ${PROJECT} ]]; then
PROJECT=${prj}
ROLE="${PROJECT}:participant-a"
......@@ -148,6 +142,11 @@ do
exit 1
fi
fi
if ! [[ "${ns}" =~ ^/.* ]]; then
# relative path
ns="${NAMESPACE_ROOT}/${ns}"
fi
COMMAND="${COMMAND} :namespace ${ns}"
done
COMMAND="${COMMAND} :token < :role -type role ${ROLE} :to now+${EXPIRE_DAYS}day > :ncsr ${NCSR} :verbose ${VERBOSE} :overwrite ${OVERWRITE}"
......
......@@ -120,16 +120,10 @@ fi
COMMAND="${COMMAND} :download <"
for ns in "${NAMESPACES[@]}"
do
if [[ "${ns}" =~ ^${NAMESPACE_ROOT}/.* ]]; then
path=${ns#$NAMESPACE_ROOT/} # remove leading root namespace
IFS='/' read -r -a array <<< "${path}"
prj="${array[0]}"
else
path=${ns#*/} # remove leading slash
IFS='/' read -r -a array <<< "${path}"
prj="${array[0]}"
ns="${NAMESPACE_ROOT}/${path}" # get full path of the namespace
fi
prj=$(echo $ns | sed -n 's/.*\/\(proj-[^\/]*\)\/.*/\1/p')
[[ -z "${prj}" ]] && prj=$(echo $ns | sed -n 's/^\(proj-[^\/]*\)\/.*/\1/p')
[[ -z "${prj}" ]] && echo "Failed to resolve project id from path: ${ns}" && exit 1
if [[ -z ${PROJECT} ]]; then
PROJECT=${prj}
ROLE="${PROJECT}:participant-a"
......@@ -141,6 +135,11 @@ do
exit 1
fi
fi
if ! [[ "${ns}" =~ ^/.* ]]; then
# relative path
ns="${NAMESPACE_ROOT}/${ns}"
fi
COMMAND="${COMMAND} :namespace \"${ns}"\"
done
COMMAND="${COMMAND} :token < :role -type role ${ROLE} :to now+${EXPIRE_DAYS}day > :verbose ${VERBOSE} :overwrite ${OVERWRITE}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment