diff --git a/src/desktop/appupdate.js b/src/desktop/appupdate.js index ccbe208..c37765d 100644 --- a/src/desktop/appupdate.js +++ b/src/desktop/appupdate.js @@ -10,6 +10,7 @@ import { launchWindowsInstaller } from './winappupdate.js' import { checkForDuplicateInstallations } from './check-duplicate-installations.js' import { scheduleAppRestart } from './updater-runner.js' import buildInfo from '../buildInfo.json' +import { version as packageVersion } from '../../package.json' import { getAppSettings, setAppSettings } from './store.js' const SUPPORTED_TARGETS = { @@ -232,11 +233,8 @@ const formatFullAppVersion = (version, buildNumber) => { return `v${normalizedVersion}-${buildSuffix}` } -const getRunningAppVersion = () => - formatFullAppVersion( - process.env.ELECTROBUN_VERSION, - buildInfo?.buildNumber - ) +export const getRunningAppVersion = () => + formatFullAppVersion(packageVersion, buildInfo?.buildNumber) const getRunningAppState = (mainWindow, settings) => ({ version: getRunningAppVersion(), diff --git a/src/desktop/rpc.js b/src/desktop/rpc.js index 91a1fdd..d495cd8 100644 --- a/src/desktop/rpc.js +++ b/src/desktop/rpc.js @@ -1,5 +1,9 @@ import { BrowserView } from 'electrobun/bun' -import { checkForCompletedUpdate, startAppUpdate } from './appupdate.js' +import { + checkForCompletedUpdate, + getRunningAppVersion, + startAppUpdate +} from './appupdate.js' import { checkForDuplicateInstallations, removeDuplicateInstallations @@ -89,7 +93,7 @@ export function createAppRpc() { }) return { ok: true } }, - getAppVersion: async () => process.env.ELECTROBUN_VERSION || 'desktop', + getAppVersion: async () => getRunningAppVersion() || 'desktop', getAppEngine: async () => { const mainWindow = getMainWindow() const renderer = mainWindow?.renderer || 'native'