Merge pull request 'Fix the check, for real this time.' (#16) from andrea.dellamico/docker-jenkins-integration-test:master into master
Reviewed-on: gCubeSystem/docker-jenkins-integration-test#16
This commit is contained in:
commit
a2f250aa14
|
@ -30,15 +30,15 @@ _retval=
|
||||||
if [ -d /home/${USER}/workspace ]; then
|
if [ -d /home/${USER}/workspace ]; then
|
||||||
rmdir /home/${USER}/workspace
|
rmdir /home/${USER}/workspace
|
||||||
_retval=$?
|
_retval=$?
|
||||||
fi
|
if [ $_retval -ne 0 ]; then
|
||||||
if [ $_retval -ne 0 ]; then
|
|
||||||
echo "The user has a directory named 'workspace' inside their home directory and it is not empty."
|
echo "The user has a directory named 'workspace' inside their home directory and it is not empty."
|
||||||
echo "Not starting the workspace mount"
|
echo "Not starting the workspace mount"
|
||||||
exit
|
exit $_retval
|
||||||
else
|
fi
|
||||||
ln -s /home/${USER}/workspace $workspace_dir
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ln -sf /home/${USER}/workspace $workspace_dir
|
||||||
|
|
||||||
echo "Mount the workspace"
|
echo "Mount the workspace"
|
||||||
su - "$USER" -c "/usr/bin/java -cp .:${workspace_dir}:${workspace_logdir}/ -Dlogback.configurationFile=${workspace_logdir}/logback.xml -jar $workspace_fuse_jar $SHINYPROXY_OIDC_ACCESS_TOKEN $workspace_dir" >/dev/null 2>&1 &
|
su - "$USER" -c "/usr/bin/java -cp .:${workspace_dir}:${workspace_logdir}/ -Dlogback.configurationFile=${workspace_logdir}/logback.xml -jar $workspace_fuse_jar $SHINYPROXY_OIDC_ACCESS_TOKEN $workspace_dir" >/dev/null 2>&1 &
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue