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 an issue created by another PR #20226

Merged
merged 2 commits into from
Jul 9, 2024
Merged

Fix an issue created by another PR #20226

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6834e91
Fix an issue created by another PR
dantecatalfamo Jul 4, 2024
9d2defb
Re-fix script to not call sudo on bash function
dantecatalfamo Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions orbit/tools/cleanup/cleanup_macos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

if [ $(id -u) -ne 0 ]; then
if [ $(id -u) -ne 0 -a -z "$GITHUB_ACTIONS" ]; then
echo "Please run as root"
exit 1
fi
Expand Down Expand Up @@ -28,5 +28,11 @@ else
# We are in the parent shell, start the detached child and return success
echo "Removing fleet, system will be unenrolled in 15 seconds..."
echo "Executing detached child process"
bash -c "bash $0 remove >/dev/null 2>/dev/null </dev/null &"
if [ -z "$GITHUB_ACTIONS" ]; then
# We are root
bash -c "bash $0 remove >/dev/null 2>/dev/null </dev/null &"
else
# We are in a github action
sudo bash -c "bash $0 remove >/dev/null 2>/dev/null </dev/null &"
fi
fi