Initial

server/services/intuneWinBuilder.js

@@ -1,7 +1,7 @@
 import { spawn } from 'node:child_process';
 import fs from 'node:fs';
-import path from 'node:path';
 import { config } from '../config.js';
+import { nameWithoutExtensionAny, path } from '../utils/pathUtils.js';
 
 // Wraps a PSADT/package source folder into a `.intunewin` using the Microsoft
 // Win32 Content Prep Tool (IntuneWinAppUtil.exe) on Windows, or an optional
@@ -45,7 +45,7 @@ export function buildPackagerInvocation({ toolPath, sourceFolder, setupFile, out
 
 // IntuneWinAppUtil names the output after the setup file's base name.
 export function expectedOutputFile(outputDir, setupFile) {
-  return path.join(outputDir, `${path.parse(setupFile).name}.intunewin`);
+  return path.join(outputDir, `${nameWithoutExtensionAny(setupFile, 'package')}.intunewin`);
 }
 
 export function buildIntuneWin({ sourceFolder, setupFile, outputDir }) {

server/services/logger.js

@@ -1,5 +1,5 @@
 import fs from 'node:fs';
-import path from 'node:path';
+import { path } from '../utils/pathUtils.js';
 import winston from 'winston';
 import { config } from '../config.js';
 

server/services/powershellRunner.js

@@ -1,6 +1,5 @@
 import fs from 'node:fs/promises';
 import os from 'node:os';
-import path from 'node:path';
 import { spawn } from 'node:child_process';
 import { db, id, now } from '../db.js';
 import { decryptSecret } from './cryptoStore.js';
@@ -9,6 +8,7 @@ import { logger } from './logger.js';
 import { listExecutableAssets } from '../models/assetModel.js';
 import { listExecutableCustomVariables } from '../models/variableModel.js';
 import { getBooleanSetting } from '../models/settingsModel.js';
+import { path } from '../utils/pathUtils.js';
 
 // The execution kill-switch can be set at boot via ALLOW_SCRIPT_EXECUTION and
 // flipped at runtime via the Config screen (allow_script_execution). The DB