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
No related branches found
No related tags found
No related merge requests found
...@@ -127,16 +127,10 @@ fi ...@@ -127,16 +127,10 @@ fi
COMMAND="${COMMAND} :download <" COMMAND="${COMMAND} :download <"
for ns in "${NAMESPACES[@]}" for ns in "${NAMESPACES[@]}"
do do
if [[ "${ns}" =~ ^${NAMESPACE_ROOT}/.* ]]; then prj=$(echo $ns | sed -n 's/.*\/\(proj-[^\/]*\)\/.*/\1/p')
path=${ns#$NAMESPACE_ROOT/} # remove leading root namespace [[ -z "${prj}" ]] && prj=$(echo $ns | sed -n 's/^\(proj-[^\/]*\)\/.*/\1/p')
IFS='/' read -r -a array <<< "${path}" [[ -z "${prj}" ]] && echo "Failed to resolve project id from path: ${ns}" && exit 1
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
if [[ -z ${PROJECT} ]]; then if [[ -z ${PROJECT} ]]; then
PROJECT=${prj} PROJECT=${prj}
ROLE="${PROJECT}:participant-a" ROLE="${PROJECT}:participant-a"
...@@ -148,6 +142,11 @@ do ...@@ -148,6 +142,11 @@ do
exit 1 exit 1
fi fi
fi fi
if ! [[ "${ns}" =~ ^/.* ]]; then
# relative path
ns="${NAMESPACE_ROOT}/${ns}"
fi
COMMAND="${COMMAND} :namespace ${ns}" COMMAND="${COMMAND} :namespace ${ns}"
done done
COMMAND="${COMMAND} :token < :role -type role ${ROLE} :to now+${EXPIRE_DAYS}day > :ncsr ${NCSR} :verbose ${VERBOSE} :overwrite ${OVERWRITE}" COMMAND="${COMMAND} :token < :role -type role ${ROLE} :to now+${EXPIRE_DAYS}day > :ncsr ${NCSR} :verbose ${VERBOSE} :overwrite ${OVERWRITE}"
......
...@@ -120,16 +120,10 @@ fi ...@@ -120,16 +120,10 @@ fi
COMMAND="${COMMAND} :download <" COMMAND="${COMMAND} :download <"
for ns in "${NAMESPACES[@]}" for ns in "${NAMESPACES[@]}"
do do
if [[ "${ns}" =~ ^${NAMESPACE_ROOT}/.* ]]; then prj=$(echo $ns | sed -n 's/.*\/\(proj-[^\/]*\)\/.*/\1/p')
path=${ns#$NAMESPACE_ROOT/} # remove leading root namespace [[ -z "${prj}" ]] && prj=$(echo $ns | sed -n 's/^\(proj-[^\/]*\)\/.*/\1/p')
IFS='/' read -r -a array <<< "${path}" [[ -z "${prj}" ]] && echo "Failed to resolve project id from path: ${ns}" && exit 1
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
if [[ -z ${PROJECT} ]]; then if [[ -z ${PROJECT} ]]; then
PROJECT=${prj} PROJECT=${prj}
ROLE="${PROJECT}:participant-a" ROLE="${PROJECT}:participant-a"
...@@ -141,6 +135,11 @@ do ...@@ -141,6 +135,11 @@ do
exit 1 exit 1
fi fi
fi fi
if ! [[ "${ns}" =~ ^/.* ]]; then
# relative path
ns="${NAMESPACE_ROOT}/${ns}"
fi
COMMAND="${COMMAND} :namespace \"${ns}"\" COMMAND="${COMMAND} :namespace \"${ns}"\"
done done
COMMAND="${COMMAND} :token < :role -type role ${ROLE} :to now+${EXPIRE_DAYS}day > :verbose ${VERBOSE} :overwrite ${OVERWRITE}" 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