diff --git a/webapp/copy-assets.sh b/webapp/copy-assets.sh index 8f6e4df..d5551b9 100644 --- a/webapp/copy-assets.sh +++ b/webapp/copy-assets.sh @@ -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 + diff --git a/webapp/src-tauri/src/main.rs b/webapp/src-tauri/src/main.rs index 0cee43c..6ea7351 100644 --- a/webapp/src-tauri/src/main.rs +++ b/webapp/src-tauri/src/main.rs @@ -37,8 +37,10 @@ fn main() { let app_state: State = 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"); } diff --git a/webapp/src-tauri/tauri.conf.json b/webapp/src-tauri/tauri.conf.json index 7fae809..4d17d14 100644 --- a/webapp/src-tauri/tauri.conf.json +++ b/webapp/src-tauri/tauri.conf.json @@ -71,7 +71,7 @@ "security": { "csp": { "default-src": "'self' customprotocol: asset:", - "connect-src": "ipc: http://ipc.localhost" + "connect-src": "ipc: http://localhost:8000" } }, "updater": {