Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: remove old bundled config files in mac install upgrade #145

Merged
merged 1 commit into from
Jan 6, 2025
Merged

fix: remove old bundled config files in mac install upgrade #145

merged 1 commit into from
Jan 6, 2025

Conversation

obs-gh-mattcotter
Copy link
Collaborator

Description

Remove old bundled config files in mac install upgrade. I thought cp -fR would be sufficient, but that's not the case! I wasn't able to understand why the functionality is how it is, but here's a simple example to show the issue:

$ mkdir a && echo hello > a/test.txt && cp -R a b && cat b/test.txt
hello

$ echo goodbye > a/test.txt && cp -fR a b && cat b/test.txt 
hello

$ cat a/test.txt 
goodbye

Checklist

  • Created tests which fail without the change (if possible)
  • Extended the README / documentation, if necessary

obs-gh-alexlew
obs-gh-alexlew reviewed Dec 19, 2024
View reviewed changes
scripts/install_mac.sh
sudo cp -f $tmp_dir/observe-agent $observeagent_install_dir/observe-agent
sudo cp -fR $tmp_dir/config $observeagent_install_dir/config
sudo cp -fR $tmp_dir/connections $observeagent_install_dir/connections
sudo rm -rf $observeagent_install_dir/config $observeagent_install_dir/connections $observeagent_install_dir/observe-agent
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where does the existing config file live? we should leave that alone

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The agent config is /usr/local/observe-agent/observe-agent.yaml (aka $observeagent_install_dir/observe-agent) and is untouched by this

@obs-gh-mattcotter obs-gh-mattcotter merged commit 12b4b0b into main Jan 6, 2025
8 checks passed
@obs-gh-mattcotter obs-gh-mattcotter deleted the mc/mac-install branch January 6, 2025 19:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@obs-gh-alexlew obs-gh-alexlew obs-gh-alexlew approved these changes

Assignees

@obs-gh-alexlew obs-gh-alexlew

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@obs-gh-mattcotter @obs-gh-alexlew