diff --git a/.devcontainer/vmr-source-build/devcontainer.json b/.devcontainer/vmr-source-build/devcontainer.json index 5cede5485..01eecb5dd 100644 --- a/.devcontainer/vmr-source-build/devcontainer.json +++ b/.devcontainer/vmr-source-build/devcontainer.json @@ -16,9 +16,10 @@ }, "codespaces": { "openFiles": [ - ".devcontainer/vmr-source-build/README.md" + "installer/.devcontainer/vmr-source-build/README.md" ] } }, - "onCreateCommand": "${containerWorkspaceFolder}/.devcontainer/vmr-source-build/init.sh" + "onCreateCommand": "${containerWorkspaceFolder}/installer/.devcontainer/vmr-source-build/init.sh", + "workspaceFolder": "/workspaces" } \ No newline at end of file diff --git a/.devcontainer/vmr-source-build/init.sh b/.devcontainer/vmr-source-build/init.sh index b9d4e315c..d08c2751c 100755 --- a/.devcontainer/vmr-source-build/init.sh +++ b/.devcontainer/vmr-source-build/init.sh @@ -19,11 +19,13 @@ git -C "$installer_dir" fetch --all --unshallow # We need this to figure out, which VMR branch to use vmr_branch=$(git log --pretty=format:'%D' HEAD^ | grep 'origin/' | head -n1 | sed 's@origin/@@' | sed 's@,.*@@') -"$installer_dir/eng/vmr-sync.sh" \ - --vmr "$vmr_dir" \ - --tmp "$tmp_dir" \ - --branch "$vmr_branch" \ +pushd "$installer_dir" + "./eng/vmr-sync.sh" \ + --vmr "$vmr_dir" \ + --tmp "$tmp_dir" \ + --branch "$vmr_branch" \ --debug +popd # Run prep.sh unset RepositoryName