Simplify fs utils, and move terminal to improved moveFile method

Author: pimterry

src/interceptors/terminal/terminal-scripts.ts

@@ -4,7 +4,7 @@ import * as util from 'util';
 import * as os from 'os';
 import * as path from 'path';
 
-import { canAccess, writeFile, renameFile, readFile, getRealPath } from '../../util/fs';
+import { canAccess, writeFile, moveFile, readFile, getRealPath } from '../../util/fs';
 import { logError } from '../../error-tracking';
 import { OVERRIDE_BIN_PATH } from './terminal-env-overrides';
 
@@ -228,7 +228,7 @@ const removeConfigSectionsFromFile = async (path: string) => {
     // as much as we reasonably can.
     const tempFile = targetPath + Date.now() + '.temp';
     await writeFile(tempFile, fileLines.join('\n'));
-    return renameFile(tempFile, targetPath);
+    return moveFile(tempFile, targetPath);
 };
 
 // Cleanup: strip our extra config line from all config files

src/util/fs.ts

@@ -7,17 +7,17 @@ import { lookpath } from 'lookpath';
 
 import { isErrorLike } from './error';
 
-export const statFile = promisify(fs.stat);
-export const readFile = promisify(fs.readFile);
-export const readDir = promisify(fs.readdir);
-export const readLink = promisify(fs.readlink);
-export const deleteFile = promisify(fs.unlink);
-export const checkAccess = promisify(fs.access);
-export const chmod = promisify(fs.chmod);
-export const mkDir = promisify(fs.mkdir);
-export const writeFile = promisify(fs.writeFile);
-export const renameFile = promisify(fs.rename);
-export const copyFile = promisify(fs.copyFile);
+export const statFile = fs.promises.stat;
+export const readFile = fs.promises.readFile;
+export const readDir = fs.promises.readdir;
+export const readLink = fs.promises.readlink;
+export const deleteFile = fs.promises.unlink;
+export const deleteFolder = promisify(rimraf);
+export const checkAccess = fs.promises.access;
+export const chmod = fs.promises.chmod;
+export const mkDir = fs.promises.mkdir;
+export const writeFile = fs.promises.writeFile;
+export const copyFile = fs.promises.copyFile;
 
 export const copyRecursive = async (from: string, to: string) => {
     // fs.cp is only available in Node 16.7.0+
@@ -51,8 +51,6 @@ export const getRealPath = async (targetPath: string): Promise<string | undefine
     }
 };
 
-export const deleteFolder = promisify(rimraf);
-
 export const ensureDirectoryExists = (path: string) =>
     checkAccess(path).catch(() => mkDir(path, { recursive: true }));
 
@@ -75,7 +73,7 @@ export const createTmp = (options: tmp.Options = {}) => new Promise<{
 
 export const moveFile = async (oldPath: string, newPath: string) => {
     try {
-        await renameFile(oldPath, newPath);
+        await fs.promises.rename(oldPath, newPath);
     } catch (e) {
         if (isErrorLike(e) && e.code === 'EXDEV') {
             // Cross-device - can't rename files across partions etc.