diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-03-19 16:06:15 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-03-19 16:06:15 +0000 |
| commit | 707af031a66c5aee2bd9c1d19ef9ff36a4756e52 (patch) | |
| tree | 9f39e775da3e4980d5797ae41b413dcb36d5fd35 /run-bootstrap-in-chroot | |
| parent | f226330c349731d89b924e0383852cb93629a6ca (diff) | |
| parent | d10837f89c54db9da7fe0772cb59731f9713afd2 (diff) | |
| download | morph-707af031a66c5aee2bd9c1d19ef9ff36a4756e52.tar.gz | |
Merge remote branch 'origin/master' into rm/morph-pass1
Diffstat (limited to 'run-bootstrap-in-chroot')
| -rwxr-xr-x | run-bootstrap-in-chroot | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/run-bootstrap-in-chroot b/run-bootstrap-in-chroot index 2c2e420d..1ce70790 100755 --- a/run-bootstrap-in-chroot +++ b/run-bootstrap-in-chroot @@ -31,7 +31,13 @@ update_morph() cp baserock-bootstrap "$dir/." # update bootstrap script rm -rf "$dir/tree/baserock/gits/morph" mkdir -p "$dir/tree/baserock/gits/morph" - cp -r . "$dir/tree/baserock/gits/morph/." + + # Copy everything except the target directory into the target directory. + # The point is to be able to keep the working area for a bootstrap inside + # the morph source directory. This is useful for Jenkins jobs. + local base=$(basename $(basename "$dir")) + find . -mindepth 1 -maxdepth 1 ! -name "$base" \ + -exec cp -av '{}' "$dir/tree/baserock/gits/morph" ';' } run_pass() |