Tweak scp command, to prevent uploading repositoryDir as a subdir of $version.

If for some reason (e.g., a forced rebuild), Buildbot rebuilds the same hrev,
it was possible for the scp command to place the repositoryDir as a subdir
in $arch/$version/, instead of as $arch/version. This should ensure that the
contents of repositoryDir are placed in $arch/$version/.
This commit is contained in:
Matt Madia 2013-11-30 20:26:39 -05:00
parent dbe9499e72
commit 62ee6508dd
1 changed files with 1 additions and 1 deletions

View File

@ -23,7 +23,7 @@ version=${fileName#*-}
version=${version%%-*}
# upload the repo
scp -r "$repositoryDir/" "$sshUserName@$sshServer:$sshDestPath/$arch/$version"
scp -r "$repositoryDir/*" "$sshUserName@$sshServer:$sshDestPath/$arch/$version/"
ssh "$sshUserName@$sshServer" "chmod -R 755 $sshDestPath/$arch/$version"
sshSymlinkCommand="ln -sfT $version $sshDestPath/$arch/current"
ssh "$sshUserName@$sshServer" "$sshSymlinkCommand"