diff --git a/apps/update-sources/src/app.ts b/apps/update-sources/src/app.ts index 843a3435..fbc0cfe4 100644 --- a/apps/update-sources/src/app.ts +++ b/apps/update-sources/src/app.ts @@ -13,6 +13,7 @@ import { runNixUpdate, updateVuetorrent, } from './misc'; +import { styleText } from 'node:util'; /* Constants */ @@ -178,6 +179,7 @@ const main = async() => { writeFileSync(args['f'] as string, output.join('')); } else { + console.log(styleText(['magenta'], '\n\nCommit message:\n')); console.log(output.join('')); } } diff --git a/apps/update-sources/src/caddy.ts b/apps/update-sources/src/caddy.ts index 1bf948f7..719ca2f3 100644 --- a/apps/update-sources/src/caddy.ts +++ b/apps/update-sources/src/caddy.ts @@ -2,6 +2,7 @@ import { writeFileSync } from 'node:fs'; import { spawnSync } from 'node:child_process'; import { replaceInFile } from './lib'; +import { styleText } from 'node:util'; /* Types */ interface Plugin { @@ -34,6 +35,8 @@ ${Object.entries(plugins) `; export const updateCaddyPlugins = () => { + console.log(styleText(['magenta'], '\nUpdating caddy plugins:\n')); + let updates = ''; const dir = `${FLAKE}/configurations/cluster/modules/caddy`; diff --git a/apps/update-sources/src/docker.ts b/apps/update-sources/src/docker.ts index aa5a33ae..a0390892 100644 --- a/apps/update-sources/src/docker.ts +++ b/apps/update-sources/src/docker.ts @@ -1,5 +1,6 @@ import { readdirSync } from 'node:fs'; import { spawnSync } from 'node:child_process'; +import { styleText } from 'node:util'; /* Constants */ @@ -16,6 +17,8 @@ const updateImages = (imagePath: string): string | undefined => { }; export const updateDocker = () => { + console.log(styleText(['magenta'], '\nUpdating docker images:\n')); + let updates = ''; updates += updateImages(`${FLAKE}/configurations/nos/modules/jellyfin`) ?? ''; diff --git a/apps/update-sources/src/firefox.ts b/apps/update-sources/src/firefox.ts index 0cc05066..72b48fd2 100644 --- a/apps/update-sources/src/firefox.ts +++ b/apps/update-sources/src/firefox.ts @@ -1,12 +1,13 @@ import { spawnSync } from 'node:child_process'; import { readFileSync } from 'node:fs'; +import { styleText } from 'node:util'; /* Constants */ const FLAKE = process.env.FLAKE; export const updateFirefoxAddons = () => { - console.log('Updating firefox addons using mozilla-addons-to-nix'); + console.log(styleText(['magenta'], '\nUpdating firefox addons using mozilla-addons-to-nix:\n')); const DIR = `${FLAKE}/scopedPackages/firefox-addons`; const GENERATED_FILE = `${DIR}/generated-firefox-addons.nix`; diff --git a/apps/update-sources/src/flake.ts b/apps/update-sources/src/flake.ts index 5074d27b..424aafef 100644 --- a/apps/update-sources/src/flake.ts +++ b/apps/update-sources/src/flake.ts @@ -1,10 +1,13 @@ import { spawnSync } from 'node:child_process'; +import { styleText } from 'node:util'; /* Constants */ const FLAKE = process.env.FLAKE; export const updateFlakeInputs = () => { + console.log(styleText(['magenta'], '\nUpdating flake inputs:\n')); + const output = spawnSync( `git restore flake.lock &> /dev/null; nix flake update --flake ${FLAKE}` + ' |& grep -v "warning: updating lock file" |& grep -v "unpacking"', diff --git a/apps/update-sources/src/misc.ts b/apps/update-sources/src/misc.ts index 40b5e4d4..d31d39f8 100644 --- a/apps/update-sources/src/misc.ts +++ b/apps/update-sources/src/misc.ts @@ -2,6 +2,7 @@ import { writeFileSync } from 'node:fs'; import { spawnSync } from 'node:child_process'; import { parseFetchurl } from './lib'; +import { styleText } from 'node:util'; /* Constants */ @@ -20,6 +21,8 @@ const genVueText = ( `; export const updateVuetorrent = () => { + console.log(styleText(['magenta'], '\nUpdating Vuetorrent:\n')); + const FILE = `${FLAKE}/configurations/nos/modules/qbittorrent/vuetorrent.nix`; const OLD_VERSION = JSON.parse(spawnSync('nix', @@ -53,6 +56,9 @@ export const runNixUpdate = ( const getJsonArray = (jsonObj: string) => Array(JSON.parse(jsonObj))[0].slice(1).join(' '); const realAttr = scope ? `${attr}.x86_64-linux.${scope}.${scopeAttr}` : attr; + + console.log(styleText(['magenta'], `\nUpdating ${realAttr}:\n`)); + const OLD_VERSION = getAttrVersion(realAttr); const execOptions = spawnSync( diff --git a/apps/update-sources/src/node-modules.ts b/apps/update-sources/src/node-modules.ts index 8f8eb6e7..afeb1225 100644 --- a/apps/update-sources/src/node-modules.ts +++ b/apps/update-sources/src/node-modules.ts @@ -3,6 +3,7 @@ import { accessSync, constants, existsSync } from 'node:fs'; import { spawnSync } from 'node:child_process'; import { replaceInFile, npmRun } from './lib'; +import { styleText } from 'node:util'; /* Constants */ @@ -72,7 +73,7 @@ const prefetchNpmDeps = (workspaceDir: string): string => { export default async() => { - console.log('Updating node modules'); + console.log(styleText(['magenta'], '\nUpdating node modules:\n')); const updates = {};