From 62ee6508ddd34131547eba18142631404d7816fb Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Sat, 30 Nov 2013 20:26:39 -0500 Subject: [PATCH] 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/. --- build/scripts/upload_haiku_repository | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/scripts/upload_haiku_repository b/build/scripts/upload_haiku_repository index 2b464c112d..97bceb33e7 100755 --- a/build/scripts/upload_haiku_repository +++ b/build/scripts/upload_haiku_repository @@ -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"