Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
throwaway96 committed Dec 12, 2023
2 parents b1856a4 + d1898e8 commit ea9a65b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions services/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ import ServiceRemote from './webos-service-remote';

const kHomebrewChannelPackageId = rootAppInfo.id;
const startDevmode = '/media/cryptofs/apps/usr/palm/services/com.palmdts.devmode.service/start-devmode.sh';
const installRootPath = ((): string | null => {
const homebrewBaseDir = ((): string | null => {
try {
return path.resolve(__dirname, '../../../../');
} catch (err) {
console.warn('getting installRootPath failed:', err);
console.warn('getting homebrewBaseDir failed:', err);
return null;
}
})();
Expand Down Expand Up @@ -465,7 +465,7 @@ function runService() {
const flags = Object.fromEntries(await Promise.all(futureFlags));
return {
root: runningAsRoot,
installRoot: installRootPath,
homebrewBaseDir,
...flags,
};
}),
Expand Down

0 comments on commit ea9a65b

Please sign in to comment.