From 692584ad77802b97d8958edf57a481cd9f9a6902 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 20 Sep 2024 12:36:58 -0700 Subject: [PATCH] added childprocess to read clients running processes --- Makefile | 9 ++++----- package-lock.json | 4 ++-- scripts/afterbuild.js | 17 +++++++++++++++++ src/common/config/buildConfig.ts | 10 +++++----- 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 14767d58..55e96466 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,10 @@ SIGNER?="origin" GPG=$(shell command which gpg || echo "N/A") DPKG_SIG=$(shell command which dpkg-sig || echo "N/A") -define sign_debian_package - dpkg-sig -k ${GPG_KEY_ID} --sign ${SIGNER} $1 - dpkg-sig --verify $1 -endef +#define sign_debian_package +# dpkg-sig -k ${GPG_KEY_ID} --sign ${SIGNER} $1 +# dpkg-sig --verify $1 +#endef .PHONY: check-sign-linux-deb check-sign-linux-deb: ##Check running environment to sign debian packages @@ -42,7 +42,6 @@ package-linux-deb: npm-ci ## Generates linux packages under build/linux folder mkdir -p artifacts find ./release -name '*.deb' -exec cp "{}" artifacts/ \; - .PHONY: sign sign: sign-linux-deb ## Sign packages in artifacts directory diff --git a/package-lock.json b/package-lock.json index 494691c1..451784bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mattermost-desktop", - "version": "5.10.0-develop.1", + "version": "6.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mattermost-desktop", - "version": "5.10.0-develop.1", + "version": "6.0.0", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/scripts/afterbuild.js b/scripts/afterbuild.js index 2b8d8b7e..468ee5e9 100644 --- a/scripts/afterbuild.js +++ b/scripts/afterbuild.js @@ -16,6 +16,23 @@ async function removeAppUpdate(path) { } } +// Function to scan running processes +function scanProcesses(callback) { + exec('tasklist', (error, stdout, stderr) => { + if (error) { + console.error(`Error: ${error.message}`); + return; + } + if (stderr) { + console.error(`Error: ${stderr}`); + return; + } + + const processes = stdout.split('\n').map(line => line.trim()).filter(line => line); + callback(processes); + }); +} + exports.default = async function afterAllArtifactBuild(context) { await context.artifactPaths.forEach(async (path) => { if (path.match(windowsZipRegex)) { diff --git a/src/common/config/buildConfig.ts b/src/common/config/buildConfig.ts index 0c342988..47a73541 100644 --- a/src/common/config/buildConfig.ts +++ b/src/common/config/buildConfig.ts @@ -22,11 +22,11 @@ import type {BuildConfig} from 'types/config'; */ const buildConfig: BuildConfig = { defaultServers: [ - { - name: 'buds', - url: 'https://chat.peanutsmediaserver.com/' - } - ], + { + name: 'buds', + url: 'https://chat.peanutsmediaserver.com/', + }, + ], helpLink: 'https://docs.mattermost.com/messaging/managing-desktop-app-servers.html', enableServerManagement: true, enableAutoUpdater: true,