From: Sebastien Douheret <sebastien.douheret@iot.bzh>
Date: Fri, 17 Nov 2017 09:31:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into wip
X-Git-Tag: v1.0.0-rc1~12
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=985b32b78da6e5ea008e45f6cf2df140df350ea9;hp=72f3969eeb71af69b5d97381fd4789c0ba375296;p=src%2Fxds%2Fxds-server.git

Merge remote-tracking branch 'origin/master' into wip

Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>

Conflicts:
	Makefile
	webapp/package.json
---

diff --git a/lib/apiv1/exec.go b/lib/apiv1/exec.go
index 8ffad07..30444c1 100644
--- a/lib/apiv1/exec.go
+++ b/lib/apiv1/exec.go
@@ -140,7 +140,7 @@ func (s *APIService) execCmd(c *gin.Context) {
 		}
 	}
 
-	cmd = append(cmd, "cd", fld.GetFullPath(args.RPath))
+	cmd = append(cmd, "cd", "\""+fld.GetFullPath(args.RPath)+"\"")
 	// FIXME - add 'exec' prevents to use syntax:
 	//       xds-exec -l debug -c xds-config.env -- "cd build && cmake .."
 	//  but exec is mandatory to allow to pass correctly signals
diff --git a/scripts/xds-docker-create-container.sh b/scripts/xds-docker-create-container.sh
index 88c74eb..3f5fe5f 100755
--- a/scripts/xds-docker-create-container.sh
+++ b/scripts/xds-docker-create-container.sh
@@ -174,7 +174,7 @@ echo
 [ -f ~/.ssh/known_hosts ] && { ssh-keygen -R "[localhost]:$SSH_PORT" -f ~/.ssh/known_hosts || exit 1; }
 [ ! -f ~/.ssh/id_rsa.pub ] && { ssh-keygen -t rsa -f ~/.ssh/id_rsa -P "" > /dev/null || exit 1; }
 docker exec ${NAME} bash -c "mkdir -p /home/$DOCKER_USER/.ssh" || exit 1
-docker cp ~/.ssh/id_rsa.pub ${NAME}:/home/$DOCKER_USER/.ssh/authorized_keys || exit 1
+docker cp -L ~/.ssh/id_rsa.pub ${NAME}:/home/$DOCKER_USER/.ssh/authorized_keys || exit 1
 docker exec ${NAME} bash -c "chown $DOCKER_USER:$DOCKER_USER -R /home/$DOCKER_USER/.ssh ;chmod 0700 /home/$DOCKER_USER/.ssh; chmod 0600 /home/$DOCKER_USER/.ssh/*" || exit 1
 ssh -n -o StrictHostKeyChecking=no -p $SSH_PORT $DOCKER_USER@localhost exit || exit 1