@gkalpak/aliases 0.10.3 → 0.10.4

package/README.md

@@ -59,6 +59,7 @@ Here is the list of all global dependencies with associated min. version (older
 - `grep`: [grep] >=3 (could come through a bash emulation environment on Windows, such as [git for
     Windows][git-win]' `Git BASH`)
 - `http-server`: [http-server] >=0.12.0 (installed globally via [npm] or [yarn])
+- `kdiff3`: [kdiff3] >=0.9
 - `light-server`: [light-server] >=2.5.0 (installed globally via [npm] or [yarn])
 - `ls`: [ls] >=8 (could come through a bash emulation environment on Windows, such as [git for
     Windows][git-win]' `Git BASH`)
@@ -115,6 +116,7 @@ Things I want to (but won't necessarily) do:
 [git-win]: https://git-for-windows.github.io/
 [grep]: https://en.wikipedia.org/wiki/Grep
 [http-server]: https://www.npmjs.com/package/http-server
+[kdiff3]: https://invent.kde.org/sdk/kdiff3
 [light-server]: https://www.npmjs.com/package/light-server
 [ls]: https://en.wikipedia.org/wiki/Ls
 [ng-maintain]: https://www.npmjs.com/package/@gkalpak/ng-maintain

package/bin/config/cfgbash.js

@@ -2,7 +2,7 @@
 import {stripIndentation} from '../../lib/utils.js';
 /* eslint-disable max-len */
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.10.3]
+  ### [Generated by: @gkalpak/aliases v0.10.4]
   ### Copy the following into '~/.bashrc':
 
   # Set up prompt.

package/bin/config/cfgbash.wsl.js

@@ -2,7 +2,7 @@
 import {stripIndentation} from '../../lib/utils.js';
 /* eslint-disable max-len */
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.10.3]
+  ### [Generated by: @gkalpak/aliases v0.10.4]
   ### Copy the following into '~/.bashrc':
 
   # Set up prompt.

package/bin/config/cfggit.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {stripIndentation} from '../../lib/utils.js';
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.10.3]
+  ### [Generated by: @gkalpak/aliases v0.10.4]
   ### Run the following commands:
 
   git config --global commit.gpgSign true

package/bin/config/cfggit.win32.js

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 import {stripIndentation} from '../../lib/utils.js';
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.10.3]
+  ### [Generated by: @gkalpak/aliases v0.10.4]
   ### Run the following commands:
 
   git config --global commit.gpgSign true
   git config --global core.editor "vim"
   git config --global credential.helper "manager"
   git config --global merge.tool "kdiff3"
-  git config --global mergetool.kdiff3.path "C:/Program Files/KDiff3/kdiff3.exe"
+  git config --global mergetool.kdiff3.path "C:/Program Files/KDiff3/bin/kdiff3.exe"
   git config --global mergetool.kdiff3.trustExitCode "false"
   git config --global push.default "upstream"
   git config --global rebase.autosquash "true"

package/bin/config/cfggit.wsl.js

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 import {stripIndentation} from '../../lib/utils.js';
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.10.3]
+  ### [Generated by: @gkalpak/aliases v0.10.4]
   ### Run the following commands:
 
   git config --global commit.gpgSign true
   git config --global core.editor "vim"
   git config --global credential.helper "/mnt/c/Program Files/Git/mingw64/bin/git-credential-manager.exe"
   git config --global merge.tool "kdiff3"
-  git config --global mergetool.kdiff3.path "/mnt/c/Program Files/KDiff3/kdiff3.exe"
+  git config --global mergetool.kdiff3.path "/mnt/c/Program Files/KDiff3/bin/kdiff3.exe"
   git config --global mergetool.kdiff3.trustExitCode "false"
   git config --global push.default "upstream"
   git config --global rebase.autosquash "true"

package/bin/config/cfgvim.js

@@ -2,6 +2,6 @@
 import {readFileSync} from 'node:fs';
 import {fileURLToPath} from 'node:url';
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
-console.log('""" [Generated by: @gkalpak/aliases v0.10.3]');
+console.log('""" [Generated by: @gkalpak/aliases v0.10.4]');
 console.log('""" Copy the following into \'~/.vimrc\':\n');
 console.log(readFileSync(`${__dirname}/../../lib/assets/vimrc.txt`, 'utf8').trim() + '\n');

package/bin/misc/alv.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-console.log('@gkalpak/aliases v0.10.3');
+console.log('@gkalpak/aliases v0.10.4');

package/lib/constants.js

@@ -472,10 +472,10 @@ const ALIASES = {
       default: CFGGIT_SPEC_WITH_CRED_HELPER('manager', '/path/to/kdiff3'),
       win32: CFGGIT_SPEC_WITH_CRED_HELPER(
           'manager',
-          'C:/Program Files/KDiff3/kdiff3.exe'),
+          'C:/Program Files/KDiff3/bin/kdiff3.exe'),
       wsl: CFGGIT_SPEC_WITH_CRED_HELPER(
           '/mnt/c/Program Files/Git/mingw64/bin/git-credential-manager.exe',
-          '/mnt/c/Program Files/KDiff3/kdiff3.exe'),
+          '/mnt/c/Program Files/KDiff3/bin/kdiff3.exe'),
     }),
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gkalpak/aliases",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "description": "My global aliases.",
   "keywords": [
     "Utility"