Skip to content

fix: support old VPN config names in post & pre install scripts #134

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

Merged
merged 2 commits into from
Apr 15, 2025
Merged

fix: support old VPN config names in post & pre install scripts #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7708487
fix: support old VPN config names in post & pre install scripts
ethanndickson Apr 14, 2025
47d3dca
snake case
ethanndickson Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkgbuild/scripts/postinstall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ VPN_MARKER_FILE="/tmp/coder_vpn_was_running"
# Before this script, or the user, opens the app, make sure
# Gatekeeper has ingested the notarization ticket.
spctl -avvv "/Applications/Coder Desktop.app"
# spctl can't assess non-apps, so this will always return a non-zero exit code,
# but the error message implies at minimum the signature of the extension was
# checked.
# spctl can't assess non-apps, so this will always return a non-zero exit code,
# but the error message implies at minimum the signature of the extension was
# checked.
spctl -avvv "/Applications/Coder Desktop.app/Contents/Library/SystemExtensions/com.coder.Coder-Desktop.VPN.systemextension" || true

# Restart Coder Desktop if it was running before
Expand All @@ -24,7 +24,7 @@ if [ -f "$VPN_MARKER_FILE" ]; then
echo "Restarting CoderVPN..."
echo "Sleeping for 3..."
sleep 3
scutil --nc start "Coder"
scutil --nc start "$(scutil --nc list | grep "com.coder.Coder-Desktop" | awk -F'"' '{print $2}')"
rm "$VPN_MARKER_FILE"
echo "CoderVPN started."
fi
Expand Down
12 changes: 7 additions & 5 deletions pkgbuild/scripts/preinstall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,22 @@ if pgrep 'Coder Desktop'; then
touch $RUNNING_MARKER_FILE
fi

vpn_name=$(scutil --nc list | grep "com.coder.Coder-Desktop" | awk -F'"' '{print $2}')

echo "Turning off VPN"
if scutil --nc list | grep -q "Coder"; then
if [[ -n "$vpn_name" ]]; then
echo "CoderVPN found. Stopping..."
if scutil --nc status "Coder" | grep -q "^Connected$"; then
if scutil --nc status "$vpn_name" | grep -q "^Connected$"; then
touch $VPN_MARKER_FILE
fi
scutil --nc stop "Coder"
scutil --nc stop "$vpn_name"

# Wait for VPN to be disconnected
while scutil --nc status "Coder" | grep -q "^Connected$"; do
while scutil --nc status "$vpn_name" | grep -q "^Connected$"; do
echo "Waiting for VPN to disconnect..."
sleep 1
done
while scutil --nc status "Coder" | grep -q "^Disconnecting$"; do
while scutil --nc status "$vpn_name" | grep -q "^Disconnecting$"; do
echo "Waiting for VPN to complete disconnect..."
sleep 1
done
Expand Down
Loading