Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitedb60d8

Browse files
committed
cleanup
1 parent3eca743 commitedb60d8

File tree

7 files changed

+58
-28
lines changed

7 files changed

+58
-28
lines changed

‎Coder-Desktop/Coder-Desktop/Coder_DesktopApp.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
9292
image:"MenuBarIcon",
9393
onAppear:{
9494
// If the VPN is enabled, it's likely the token isn't expired
95+
guardself.vpn.state!=.connected,self.state.hasSessionelse{return}
9596
Task{@MainActorin
96-
guardself.vpn.state!=.connected,self.state.hasSessionelse{return}
9797
awaitself.state.handleTokenExpiry()
9898
}
9999
}, content:{

‎Coder-Desktop/Coder-Desktop/Preview Content/PreviewVPN.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,5 @@ final class PreviewVPN: Coder_Desktop.VPNService {
8181
state=.connecting
8282
}
8383

84-
func updateHelperState(){}
85-
8684
var startWhenReady: Bool= false
8785
}

‎Coder-Desktop/Coder-Desktop/Views/VPN/VPNState.swift‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import ServiceManagement
21
import SwiftUI
32

43
structVPNState<VPN:VPNService>:View{
@@ -11,7 +10,7 @@ struct VPNState<VPN: VPNService>: View {
1110
Group{
1211
switch(vpn.state, state.hasSession){
1312
case(.failed(.systemExtensionError(.needsUserApproval)), _):
14-
ApprovalRequiredView<VPN>(
13+
ApprovalRequiredView(
1514
message:"Awaiting System Extension approval",
1615
action: openSystemExtensionSettings
1716
)
@@ -57,24 +56,7 @@ struct VPNState<VPN: VPNService>: View {
5756
}
5857
}
5958

60-
structHelperProgressView:View{
61-
varbody:someView{
62-
HStack{
63-
Spacer()
64-
VStack{
65-
CircularProgressView(value:nil)
66-
Text("Installing Helper...")
67-
.multilineTextAlignment(.center)
68-
}
69-
.padding()
70-
.foregroundStyle(.secondary)
71-
Spacer()
72-
}
73-
}
74-
}
75-
76-
structApprovalRequiredView<VPN:VPNService>:View{
77-
@EnvironmentObjectvarvpn:VPN
59+
structApprovalRequiredView:View{
7860
letmessage:String
7961
letaction:()->Void
8062

‎Coder-Desktop/project.yml‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,29 @@ targets:
216216
buildToolPlugins:
217217
-plugin:SwiftLintBuildToolPlugin
218218
package:SwiftLintPlugins
219+
postBuildScripts:
220+
# This is a dependency of the app, not the helper, as it copies the
221+
# helper plist from the app bundle to the system store.
222+
-name:"Upsert Helper for Local Development"
223+
# Only run this script (and prompt for admin) when the helper or any of
224+
# it's frameworks have changed.
225+
inputFiles:
226+
-"$(BUILT_PRODUCTS_DIR)/com.coder.Coder-Desktop.Helper"
227+
-"$(BUILT_PRODUCTS_DIR)/CoderSDK.framework/Versions/A/CoderSDK"
228+
-"$(BUILT_PRODUCTS_DIR)/VPNLib.framework/Versions/A/VPNLib"
229+
outputFiles:
230+
-"$(DERIVED_FILE_DIR)/upsert-helper.stamp"
231+
script:|
232+
if [ -n "${CI}" ]; then
233+
# Skip in CI
234+
exit 0
235+
fi
236+
/usr/bin/osascript <<'APPLESCRIPT'
237+
do shell script "/bin/bash -c " & quoted form of ((system attribute "SRCROOT") & "/../scripts/upsert-dev-helper.sh") with administrator privileges
238+
APPLESCRIPT
239+
/usr/bin/touch "${DERIVED_FILE_DIR}/upsert-helper.stamp"
240+
basedOnDependencyAnalysis:true
241+
runOnlyWhenInstalling:false
219242

220243
Coder-DesktopTests:
221244
type:bundle.unit-test
@@ -376,4 +399,4 @@ targets:
376399
PRODUCT_BUNDLE_IDENTIFIER:"com.coder.Coder-Desktop.Helper"
377400
PRODUCT_MODULE_NAME:"$(PRODUCT_NAME:c99extidentifier)"
378401
PRODUCT_NAME:"$(PRODUCT_BUNDLE_IDENTIFIER)"
379-
SKIP_INSTALL:YES
402+
SKIP_INSTALL:YES

‎scripts/build.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,3 @@ echo "$signature" >"$PKG_PATH.sig"
206206

207207
# Add dsym to build artifacts
208208
(cd"$ARCHIVE_PATH/dSYMs"&& zip -9 -r --symlinks"$DSYM_ZIPPED_PATH" ./*)
209-
210-
# Add zipped app to build artifacts
211-
zip -9 -r --symlinks"$APP_ZIPPED_PATH""$BUILT_APP_PATH"

‎scripts/update-cask.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ cask "coder-desktop" do
9393
9494
uninstall quit: [
9595
"com.coder.Coder-Desktop",
96-
"com.coder.Coder-Desktop.VPN",
9796
"com.coder.Coder-Desktop.Helper",
97+
"com.coder.Coder-Desktop.VPN",
9898
],
9999
login_item: "Coder Desktop"
100100

‎scripts/upsert-dev-helper.sh‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# This script operates like postinstall + preinstall, but for local development
2+
# builds, where the helper is necessary. Instead of looking for
3+
# /Applications/Coder Desktop.app, it looks for
4+
# /Applications/Coder/Coder Desktop.app, which is where the local build is
5+
# installed.
6+
7+
set -euox pipefail
8+
9+
LAUNCH_DAEMON_PLIST_SRC="/Applications/Coder/Coder Desktop.app/Contents/Library/LaunchDaemons"
10+
LAUNCH_DAEMON_PLIST_DEST="/Library/LaunchDaemons"
11+
LAUNCH_DAEMON_NAME="com.coder.Coder-Desktop.Helper"
12+
LAUNCH_DAEMON_PLIST_NAME="$LAUNCH_DAEMON_NAME.plist"
13+
LAUNCH_DAEMON_BINARY_PATH="/Applications/Coder/Coder Desktop.app/Contents/MacOS/com.coder.Coder-Desktop.Helper"
14+
15+
# Stop an existing launch daemon, if it exists
16+
sudo launchctl bootout"system/$LAUNCH_DAEMON_NAME"2>/dev/null||true
17+
18+
# Install daemon
19+
# Copy plist into system dir, with the path corrected to the local build
20+
sed's|/Applications/Coder Desktop\.app|/Applications/Coder/Coder Desktop.app|g'"$LAUNCH_DAEMON_PLIST_SRC"/"$LAUNCH_DAEMON_PLIST_NAME"| sudo tee"$LAUNCH_DAEMON_PLIST_DEST"/"$LAUNCH_DAEMON_PLIST_NAME">/dev/null
21+
# Set necessary permissions
22+
sudo chmod -R 755"$LAUNCH_DAEMON_BINARY_PATH"
23+
sudo chmod 644"$LAUNCH_DAEMON_PLIST_DEST"/"$LAUNCH_DAEMON_PLIST_NAME"
24+
sudo chown root:wheel"$LAUNCH_DAEMON_PLIST_DEST"/"$LAUNCH_DAEMON_PLIST_NAME"
25+
26+
# Load daemon
27+
sudo launchctlenable"system/$LAUNCH_DAEMON_NAME"||true# Might already be enabled
28+
sudo launchctl bootstrap system"$LAUNCH_DAEMON_PLIST_DEST/$LAUNCH_DAEMON_PLIST_NAME"
29+
sudo launchctl kickstart -k"system/$LAUNCH_DAEMON_NAME"
30+

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp