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

fix: macOS #35

Merged
merged 1 commit into from
Jul 17, 2024
Merged

fix: macOS #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions webapp/copy-assets.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,9 @@ mkdir -p "$tauri_dist_binary"

# Copy all files in core_dist_binary to tauri_dist_binary
cp -r "$core_dist_binary/"* "$tauri_dist_binary"

# make all files in tauri_dist_binary executable
if [[ "$OSTYPE" != "msys" ]]; then
find "$tauri_dist_binary" -type f -exec chmod +x {} \;
fi

4 changes: 3 additions & 1 deletion webapp/src-tauri/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ fn main() {
let app_state: State<AppState> = app.state();

let is_up = app_state.is_core_server_up();
if !is_up {
if is_up {
warn!("Core Sidecar is already running");
}
if !is_up {
app_state.start_core_server().expect("Core Sidecar start failed");
}

Expand Down
2 changes: 1 addition & 1 deletion webapp/src-tauri/tauri.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"security": {
"csp": {
"default-src": "'self' customprotocol: asset:",
"connect-src": "ipc: http://ipc.localhost"
"connect-src": "ipc: http://localhost:8000"
}
},
"updater": {
Expand Down