From 15c9207542672e6c16660dee403f3c5c25c7b4d7 Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Thu, 15 Feb 2024 00:00:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Linux=20=E7=AB=AF=20hostna?= =?UTF-8?q?mectl=20=E5=91=BD=E4=BB=A4=E4=B8=8D=E5=8F=AF=E7=94=A8=E6=97=B6?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=B8=8E=E6=89=8B=E6=9C=BA=E7=AB=AF=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E7=9A=84=E9=97=AE=E9=A2=98=20(#1784)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Don't fail to sync without hostnamectl * update --------- Co-authored-by: lyswhut --- src/main/modules/sync/utils.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/modules/sync/utils.ts b/src/main/modules/sync/utils.ts index 8bf7bb42..444477b4 100644 --- a/src/main/modules/sync/utils.ts +++ b/src/main/modules/sync/utils.ts @@ -31,11 +31,15 @@ export const getComputerName = () => { name = process.env.COMPUTERNAME break case 'darwin': - name = cp.execSync('scutil --get ComputerName').toString().trim() + try { + name = cp.execSync('scutil --get ComputerName').toString().trim() + } catch {} break case 'linux': - name = cp.execSync('hostnamectl --pretty').toString().trim() - break + // Don't fail even if hostnamectl is unavailable + try { + name = cp.execSync('hostnamectl --pretty').toString().trim() + } catch {} } if (!name) name = os.hostname() return name