update
This commit is contained in:
@@ -131,9 +131,14 @@ for_window [app_id="chromium-browser"] fullscreen enable
|
|||||||
// Write sway config before starting
|
// Write sway config before starting
|
||||||
const configPath = await this.writeSwayConfig(config);
|
const configPath = await this.writeSwayConfig(config);
|
||||||
|
|
||||||
|
// Use a fixed socket path so we can reliably connect
|
||||||
|
const swaySocketPath = `${config.runtimeDir}/sway-ipc.sock`;
|
||||||
|
this.swaySocket = swaySocketPath;
|
||||||
|
|
||||||
const env: Record<string, string> = {
|
const env: Record<string, string> = {
|
||||||
XDG_RUNTIME_DIR: config.runtimeDir,
|
XDG_RUNTIME_DIR: config.runtimeDir,
|
||||||
WLR_BACKENDS: config.backends,
|
WLR_BACKENDS: config.backends,
|
||||||
|
SWAYSOCK: swaySocketPath,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (config.allowSoftwareRendering) {
|
if (config.allowSoftwareRendering) {
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
export const VERSION = "0.4.11";
|
export const VERSION = "0.4.12";
|
||||||
|
|||||||
@@ -110,9 +110,16 @@ class EcoVDAgent:
|
|||||||
# Search common locations
|
# Search common locations
|
||||||
runtime_dir = os.environ.get('XDG_RUNTIME_DIR', '/run/user/1000')
|
runtime_dir = os.environ.get('XDG_RUNTIME_DIR', '/run/user/1000')
|
||||||
|
|
||||||
# Try to find sway socket
|
# Try to find sway socket - check fixed path first, then glob patterns
|
||||||
|
import glob
|
||||||
|
|
||||||
|
# Check for fixed socket path first (set by eco-daemon)
|
||||||
|
fixed_socket = f'{runtime_dir}/sway-ipc.sock'
|
||||||
|
if os.path.exists(fixed_socket):
|
||||||
|
return fixed_socket
|
||||||
|
|
||||||
|
# Fall back to glob patterns for standard Sway socket naming
|
||||||
for pattern in [f'{runtime_dir}/sway-ipc.*.sock', '/run/user/*/sway-ipc.*.sock']:
|
for pattern in [f'{runtime_dir}/sway-ipc.*.sock', '/run/user/*/sway-ipc.*.sock']:
|
||||||
import glob
|
|
||||||
sockets = glob.glob(pattern)
|
sockets = glob.glob(pattern)
|
||||||
if sockets:
|
if sockets:
|
||||||
return sockets[0]
|
return sockets[0]
|
||||||
|
|||||||
Binary file not shown.
@@ -110,9 +110,16 @@ class EcoVDAgent:
|
|||||||
# Search common locations
|
# Search common locations
|
||||||
runtime_dir = os.environ.get('XDG_RUNTIME_DIR', '/run/user/1000')
|
runtime_dir = os.environ.get('XDG_RUNTIME_DIR', '/run/user/1000')
|
||||||
|
|
||||||
# Try to find sway socket
|
# Try to find sway socket - check fixed path first, then glob patterns
|
||||||
|
import glob
|
||||||
|
|
||||||
|
# Check for fixed socket path first (set by eco-daemon)
|
||||||
|
fixed_socket = f'{runtime_dir}/sway-ipc.sock'
|
||||||
|
if os.path.exists(fixed_socket):
|
||||||
|
return fixed_socket
|
||||||
|
|
||||||
|
# Fall back to glob patterns for standard Sway socket naming
|
||||||
for pattern in [f'{runtime_dir}/sway-ipc.*.sock', '/run/user/*/sway-ipc.*.sock']:
|
for pattern in [f'{runtime_dir}/sway-ipc.*.sock', '/run/user/*/sway-ipc.*.sock']:
|
||||||
import glob
|
|
||||||
sockets = glob.glob(pattern)
|
sockets = glob.glob(pattern)
|
||||||
if sockets:
|
if sockets:
|
||||||
return sockets[0]
|
return sockets[0]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@ecobridge/eco-os",
|
"name": "@ecobridge/eco-os",
|
||||||
"version": "0.4.11",
|
"version": "0.4.12",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "[ -z \"$CI\" ] && npm version patch --no-git-tag-version || true && node -e \"const v=require('./package.json').version; require('fs').writeFileSync('ecoos_daemon/ts/version.ts', 'export const VERSION = \\\"'+v+'\\\";\\n');\" && pnpm run daemon:bundle && cp ecoos_daemon/bundle/eco-daemon isobuild/config/includes.chroot/opt/eco/bin/ && mkdir -p .nogit/iso && docker build --no-cache -t ecoos-builder -f isobuild/Dockerfile . && docker run --privileged --name ecoos-build ecoos-builder && docker cp ecoos-build:/output/ecoos.iso .nogit/iso/ecoos.iso && docker rm ecoos-build",
|
"build": "[ -z \"$CI\" ] && npm version patch --no-git-tag-version || true && node -e \"const v=require('./package.json').version; require('fs').writeFileSync('ecoos_daemon/ts/version.ts', 'export const VERSION = \\\"'+v+'\\\";\\n');\" && pnpm run daemon:bundle && cp ecoos_daemon/bundle/eco-daemon isobuild/config/includes.chroot/opt/eco/bin/ && mkdir -p .nogit/iso && docker build --no-cache -t ecoos-builder -f isobuild/Dockerfile . && docker run --privileged --name ecoos-build ecoos-builder && docker cp ecoos-build:/output/ecoos.iso .nogit/iso/ecoos.iso && docker rm ecoos-build",
|
||||||
|
|||||||
Reference in New Issue
Block a user