@gkalpak/aliases 0.9.1 → 0.9.4

package/README.md

@@ -54,7 +54,7 @@ inspecting the associated command (e.g. via `halp`).
 
 Here is the list of all global dependencies with associated min. version (older versions are not guaranteed work):
 
-- `git`: [git] >=1.8
+- `git`: [git] >=2.35
 - `docker`: [docker] >= 17
 - `grep`: [grep] >=3 (could come through a bash emulation environment on Windows, such as [git for
     Windows][git-win]' `Git BASH`)

package/bin/config/cfgbash.js

@@ -3,7 +3,7 @@
 const utils = require('../../lib/utils');
 /* eslint-disable max-len */
 console.log(utils.stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.9.1]
+  ### [Generated by: @gkalpak/aliases v0.9.4]
   ### Copy the following into '~/.bashrc':
 
   # Set up prompt.
@@ -17,4 +17,3 @@ console.log(utils.stripIndentation(`
 
 `));
 /* eslint-enable max-len */
-

package/bin/config/cfgbash.wsl.js

@@ -0,0 +1,22 @@
+#!/usr/bin/env node
+'use strict';
+const utils = require('../../lib/utils');
+/* eslint-disable max-len */
+console.log(utils.stripIndentation(`
+  ### [Generated by: @gkalpak/aliases v0.9.4]
+  ### Copy the following into '~/.bashrc':
+
+  # Set up prompt.
+  PS1='\\[\\033[90m\\][\\d \\t]\\[\\033[00m\\]\\n\${debian_chroot:+($debian_chroot)}\\[\\033[01;32m\\]\\u@\\h\\[\\033[00m\\]:\\[\\033[01;34m\\]\\w\\[\\033[00m\\]$ ';
+
+  # Improve tab completion.
+  bind "set completion-ignore-case on";
+  bind "set menu-complete-display-prefix on";
+  bind "set show-all-if-ambiguous on";
+  bind "TAB:menu-complete";
+
+  # Fix required for GPG signing in WSL.
+  export GPG_TTY="$(tty)";
+
+`));
+/* eslint-enable max-len */

package/bin/config/cfggit.js

@@ -2,17 +2,20 @@
 'use strict';
 const utils = require('../../lib/utils');
 console.log(utils.stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.9.1]
+  ### [Generated by: @gkalpak/aliases v0.9.4]
   ### Run the following commands:
 
+  git config --global commit.gpgSign true
   git config --global core.editor "vim"
-  git config --global credential.helper "store"
+  git config --global credential.helper "manager"
   git config --global merge.tool "kdiff3"
   git config --global mergetool.kdiff3.path "/path/to/kdiff3"
   git config --global mergetool.kdiff3.trustExitCode "false"
   git config --global push.default "upstream"
   git config --global rebase.autosquash "true"
   git config --global rebase.autostash "true"
+  git config --global tag.gpgSign true
   git config --global user.email "kalpakas.g@gmail.com"
   git config --global user.name "George Kalpakas"
+  git config --global user.signingKey "0FF21FC44ECE9F07"
 `));

package/bin/config/cfggit.wsl.js

@@ -2,17 +2,20 @@
 'use strict';
 const utils = require('../../lib/utils');
 console.log(utils.stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.9.1]
+  ### [Generated by: @gkalpak/aliases v0.9.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/libexec/git-core/git-credential-manager.exe"
+  git config --global credential.helper "/mnt/c/Program\\ Files/Git/mingw64/bin/git-credential-manager-core.exe"
   git config --global merge.tool "kdiff3"
   git config --global mergetool.kdiff3.path "/path/to/kdiff3"
   git config --global mergetool.kdiff3.trustExitCode "false"
   git config --global push.default "upstream"
   git config --global rebase.autosquash "true"
   git config --global rebase.autostash "true"
+  git config --global tag.gpgSign true
   git config --global user.email "kalpakas.g@gmail.com"
   git config --global user.name "George Kalpakas"
+  git config --global user.signingKey "0FF21FC44ECE9F07"
 `));

package/bin/config/cfgvim.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 'use strict';
-console.log('""" [Generated by: @gkalpak/aliases v0.9.1]');
+console.log('""" [Generated by: @gkalpak/aliases v0.9.4]');
 console.log('""" Copy the following into \'~/.vimrc\':\n');
 console.log(require('fs').readFileSync(`${__dirname}/../../lib/assets/vimrc.txt`, 'utf8').trim() + '\n');

package/bin/git/gbcm.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 'use strict';
 // eslint-disable-next-line max-len
-const cmd = module.exports = 'git checkout master -b $1 && git config branch.$1.remote origin && git config branch.$1.merge refs/heads/$1';
+const cmd = module.exports = 'git checkout ${0:::(git show-ref --heads --quiet master && echo master) || (git show-ref --heads --quiet main && echo main) || echo unknown-branch} -b $1 && git config branch.$1.remote origin && git config branch.$1.merge refs/heads/$1';
 if (require.main === module) {
   const {commandUtils} = require('@gkalpak/cli-utils');
   const {onError} = require('../../lib/utils');

package/bin/git/gcom.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 'use strict';
 // eslint-disable-next-line max-len
-const cmd = module.exports = 'git checkout master $*';
+const cmd = module.exports = 'git checkout ${0:::(git show-ref --heads --quiet master && echo master) || (git show-ref --heads --quiet main && echo main) || echo unknown-branch} $*';
 if (require.main === module) {
   const {commandUtils} = require('@gkalpak/cli-utils');
   const {onError} = require('../../lib/utils');

package/bin/git/gdefb.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+'use strict';
+// eslint-disable-next-line max-len
+const cmd = module.exports = '(git show-ref --heads --quiet master && echo master) || (git show-ref --heads --quiet main && echo main) || echo unknown-branch';
+if (require.main === module) {
+  const {commandUtils} = require('@gkalpak/cli-utils');
+  const {onError} = require('../../lib/utils');
+  const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));
+  // eslint-disable-next-line quotes
+  commandUtils.run(cmd, args, Object.assign({"sapVersion":2}, config)).catch(onError);
+}

package/bin/git/gprom.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 'use strict';
 // eslint-disable-next-line max-len
-const cmd = module.exports = 'git pull --rebase origin master $*';
+const cmd = module.exports = 'git pull --rebase origin ${0:::(git show-ref --heads --quiet master && echo master) || (git show-ref --heads --quiet main && echo main) || echo unknown-branch} $*';
 if (require.main === module) {
   const {commandUtils} = require('@gkalpak/cli-utils');
   const {onError} = require('../../lib/utils');

package/bin/git/gprum.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 'use strict';
 // eslint-disable-next-line max-len
-const cmd = module.exports = 'git pull --rebase upstream master $*';
+const cmd = module.exports = 'git pull --rebase upstream ${0:::(git show-ref --heads --quiet master && echo master) || (git show-ref --heads --quiet main && echo main) || echo unknown-branch} $*';
 if (require.main === module) {
   const {commandUtils} = require('@gkalpak/cli-utils');
   const {onError} = require('../../lib/utils');

package/bin/git/grbm.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 'use strict';
 // eslint-disable-next-line max-len
-const cmd = module.exports = 'git rebase --ignore-date master $*';
+const cmd = module.exports = 'git rebase --ignore-date ${0:::(git show-ref --heads --quiet master && echo master) || (git show-ref --heads --quiet main && echo main) || echo unknown-branch} $*';
 if (require.main === module) {
   const {commandUtils} = require('@gkalpak/cli-utils');
   const {onError} = require('../../lib/utils');

package/bin/git/gsync.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 'use strict';
 // eslint-disable-next-line max-len
-const cmd = module.exports = 'git checkout ${1:master} && git pull upstream ${1:master} && git push origin ${1:master}';
+const cmd = module.exports = 'git checkout ${1:::(git show-ref --heads --quiet master && echo master) || (git show-ref --heads --quiet main && echo main) || echo unknown-branch} && git pull upstream ${1:::(git show-ref --heads --quiet master && echo master) || (git show-ref --heads --quiet main && echo main) || echo unknown-branch} && git push origin ${1:::(git show-ref --heads --quiet master && echo master) || (git show-ref --heads --quiet main && echo main) || echo unknown-branch}';
 if (require.main === module) {
   const {commandUtils} = require('@gkalpak/cli-utils');
   const {onError} = require('../../lib/utils');

package/bin/misc/alv.js

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 'use strict';
-console.log('@gkalpak/aliases v0.9.1');
+console.log('@gkalpak/aliases v0.9.4');

package/lib/alias-scripts/gcoghpr.js

@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 'use strict';
 
 // Imports
@@ -46,7 +47,7 @@ class _Gcoghpr {
    * 1. Guess the upstream URL (looking at remotes `upstream` or `origin`).
    * 2. Retrieve the PR author and branch (either extracting it from the input or fetching it from GitHub).
    * 3. Check if a local branch with the same name already exists. (If it does, ask for permission to overwrite it.)
-   * 4. Check out master.
+   * 4. Check out the default branch.
    * 5. Fetch the PR branch from the author's remote into a local branch (with the same name).
    * 6. Switch to the new branch.
    * 7. Set up the local branch to track the PR branch.
@@ -103,7 +104,10 @@ class _Gcoghpr {
           then(() => executor.exec(`git show-ref --heads --quiet ${localBranch}`).
             then(() => this._confirmOverwriteBranch(localBranch), () => undefined)).
           then(() => executor.execForOutput('git rev-parse --abbrev-ref HEAD')).
-          then(currentBranch => (currentBranch === localBranch) && executor.exec('git checkout master')).
+          then(currentBranch =>
+            (currentBranch === localBranch) &&
+              executor.execForOutput(this._constants.ALIASES.git.gdefb.getSpec().command).
+                then(defaultBranch => executor.exec(`git checkout ${defaultBranch}`))).
           then(() => executor.exec(`git remote remove ${remoteAlias} || true`)).
           then(() => executor.exec(`git remote add ${remoteAlias} ${originUrl}`)).
           then(() => executor.exec(`git fetch --no-tags ${remoteAlias} ${branch}`)).
@@ -123,8 +127,8 @@ class _Gcoghpr {
     return new Promise((resolve, reject) => {
       const rlInstance = this._rl.createInterface(process.stdin, process.stdout);
       const question = chalk.yellow(
-        `Branch '${branch}' does already exist.\n` +
-        `Overwrite it? ${chalk.white('[y/N]')} `);
+          `Branch '${branch}' does already exist.\n` +
+          `Overwrite it? ${chalk.white('[y/N]')} `);
 
       rlInstance.question(question, answer => {
         rlInstance.close();
@@ -278,8 +282,8 @@ class GitHubUtils {
     if (!ghToken && !this._shownTokenWarning) {
       this._shownTokenWarning = true;
       this._logger.warn(
-        `No GitHub access token found in \`${GH_TOKEN_NAME}\` environment variable.\n` +
-        'Proceeding anonymously (and subject to rate-limiting)...');
+          `No GitHub access token found in \`${GH_TOKEN_NAME}\` environment variable.\n` +
+          'Proceeding anonymously (and subject to rate-limiting)...');
     }
 
     return this._httpsGet(url, options).then(responseText => {

package/lib/alias.js

@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 'use strict';
 
 // Imports
@@ -65,7 +66,7 @@ class AliasSpec/* implements IAliasSpec */ {
 
 class AliasSpecDefault extends AliasSpec {
   static DEF_CODE() {
-    throw new Error('You are supposed to overwrite this method, before creating any instances.');
+    throw new Error('This method is supposed to be overwritten, before any instances are created.');
   }
 
   constructor(command/* string */, config/*? IRunConfig */) {

package/lib/constants.js

@@ -12,6 +12,9 @@ const VERSION_STAMP = `${pkg.name} v${pkg.version}`;
 const ROOT_DIR = path.resolve(__dirname, '..');
 const BIN_DIR = path.join(ROOT_DIR, 'bin');
 const SOURCE_NVM_CMD = '. $NVM_DIR/nvm.sh';
+const GIT_GET_DEFAULT_BRANCH_CMD =
+    `${['master', 'main'].map(b => `(git show-ref --heads --quiet ${b} && echo ${b})`).join(' || ')} || ` +
+    'echo unknown-branch';
 const GLOBAL_NPM_PACKAGES = [
   '@angular/cli',
   '@gkalpak/aliases',
@@ -33,6 +36,7 @@ const GLOBAL_NPM_PACKAGES = [
 
 const DESC_REPLACEMENTS = {
   [AliasUnknown.DESCRIPTION]: '???',
+  [`::${GIT_GET_DEFAULT_BRANCH_CMD}`]: '<default-branch>',
   '::__a-builds-dir': '(<.../angular/aio/aio-builds-setup>)',
   '::__g-pick-branch --gkcu-returnOutput=1': '(interactively pick a branch)',
   '::__g-pick-commit --gkcu-returnOutput=1': '(interactively pick a commit)',
@@ -52,28 +56,60 @@ const DEF_CODE = AliasSpecDefault.DEF_CODE = (cmd, cfg = {}) => utils.stripInden
   }
 `);
 
+const CFGBASH_SPEC = isWsl => new AliasSpec(
+    /* eslint-disable max-len */
+    utils.stripIndentation(`
+      #!/usr/bin/env node
+      'use strict';
+      const utils = require('../../lib/utils');
+      /* eslint-disable max-len */
+      console.log(utils.stripIndentation(\`
+        ### [Generated by: ${VERSION_STAMP}]
+        ### Copy the following into '~/.bashrc':
+
+        # Set up prompt.
+        PS1='\\\\[\\\\033[90m\\\\][\\\\d \\\\t]\\\\[\\\\033[00m\\\\]\\\\n\\\${debian_chroot:+($debian_chroot)}\\\\[\\\\033[01;32m\\\\]\\\\u@\\\\h\\\\[\\\\033[00m\\\\]:\\\\[\\\\033[01;34m\\\\]\\\\w\\\\[\\\\033[00m\\\\]$ ';
+
+        # Improve tab completion.
+        bind "set completion-ignore-case on";
+        bind "set menu-complete-display-prefix on";
+        bind "set show-all-if-ambiguous on";
+        bind "TAB:menu-complete";${!isWsl ? '' : `
+
+        # Fix required for GPG signing in WSL.
+        export GPG_TTY="$(tty)";`}
+
+      \`));
+      /* eslint-enable max-len */
+    `),
+    /* eslint-enable max-len */
+    'Show configuration instructions for `bash`.');
+
 const CFGGIT_SPEC_WITH_CRED_HELPER = credHelper => new AliasSpec(
-  utils.stripIndentation(`
-    #!/usr/bin/env node
-    'use strict';
-    const utils = require('../../lib/utils');
-    console.log(utils.stripIndentation(\`
-      ### [Generated by: ${VERSION_STAMP}]
-      ### Run the following commands:
-
-      git config --global core.editor "vim"
-      git config --global credential.helper "${credHelper}"
-      git config --global merge.tool "kdiff3"
-      git config --global mergetool.kdiff3.path "/path/to/kdiff3"
-      git config --global mergetool.kdiff3.trustExitCode "false"
-      git config --global push.default "upstream"
-      git config --global rebase.autosquash "true"
-      git config --global rebase.autostash "true"
-      git config --global user.email "kalpakas.g@gmail.com"
-      git config --global user.name "George Kalpakas"
-    \`));
-  `),
-  'Show configuration instructions for `git`.');
+    utils.stripIndentation(`
+      #!/usr/bin/env node
+      'use strict';
+      const utils = require('../../lib/utils');
+      console.log(utils.stripIndentation(\`
+        ### [Generated by: ${VERSION_STAMP}]
+        ### Run the following commands:
+
+        git config --global commit.gpgSign true
+        git config --global core.editor "vim"
+        git config --global credential.helper "${credHelper}"
+        git config --global merge.tool "kdiff3"
+        git config --global mergetool.kdiff3.path "/path/to/kdiff3"
+        git config --global mergetool.kdiff3.trustExitCode "false"
+        git config --global push.default "upstream"
+        git config --global rebase.autosquash "true"
+        git config --global rebase.autostash "true"
+        git config --global tag.gpgSign true
+        git config --global user.email "kalpakas.g@gmail.com"
+        git config --global user.name "George Kalpakas"
+        git config --global user.signingKey "0FF21FC44ECE9F07"
+      \`));
+    `),
+    'Show configuration instructions for `git`.');
 
 const SCRIPT_BACKED_CODE = (scriptName, desc) => utils.stripIndentation(`
   #!/usr/bin/env node
@@ -168,6 +204,7 @@ const ALIASES = {
   git: {
     // STATUS
     gs: new AliasDefault('git status $*'),
+    gdefb: new AliasDefault(GIT_GET_DEFAULT_BRANCH_CMD),
     gl: new AliasDefault('git log --decorate $* || true'),
     gl1: new AliasDefault('git log --decorate --oneline $* || true'),
     gl1g: new AliasDefault('git log --decorate --oneline | grep $*'),
@@ -188,13 +225,13 @@ const ALIASES = {
 
     // CHECKOUT
     gco: new AliasDefault('git checkout ${*:::__g-pick-branch --gkcu-returnOutput=1}'),
-    gcom: new AliasDefault('git checkout master $*'),
+    gcom: new AliasDefault(`git checkout \${0:::${GIT_GET_DEFAULT_BRANCH_CMD}} $*`),
     gcopr: new AliasDefault('git fetch upstream pull/$1/head && git checkout FETCH_HEAD'),
     gcoghpr: SCRIPT_BACKED_ALIAS('gcoghpr', 'Check out a GitHub pull request as a local branch.'),
     'gcoghpr-cleanup': new AliasDefault(
-      CLEANUP_CODE('git branches', `${PR_LOCAL_BRANCH_PREFIX}-`, 'git branch', 'git branch --delete --force') +
-      ' && ' +
-      CLEANUP_CODE('git remotes', `${PR_REMOTE_ALIAS_PREFIX}-`, 'git remote show', 'git remote remove')),
+        CLEANUP_CODE('git branches', `${PR_LOCAL_BRANCH_PREFIX}-`, 'git branch', 'git branch --delete --force') +
+        ' && ' +
+        CLEANUP_CODE('git remotes', `${PR_REMOTE_ALIAS_PREFIX}-`, 'git remote show', 'git remote remove')),
 
     // ADD / COMMIT
     gaa: new AliasDefault('git add --all $*'),
@@ -224,25 +261,30 @@ const ALIASES = {
     // BRANCH
     gb: new AliasDefault('git branch $*'),
     gbc: new AliasDefault(
-      'git checkout ${2:HEAD} -b $1 && git config branch.$1.remote origin && git config branch.$1.merge refs/heads/$1'),
+        'git checkout ${2:HEAD} -b $1 && git config branch.$1.remote origin && ' +
+        'git config branch.$1.merge refs/heads/$1'),
     gbcm: new AliasDefault(
-      'git checkout master -b $1 && git config branch.$1.remote origin && git config branch.$1.merge refs/heads/$1'),
+        `git checkout \${0:::${GIT_GET_DEFAULT_BRANCH_CMD}} -b $1 && git config branch.$1.remote origin && ` +
+        'git config branch.$1.merge refs/heads/$1'),
     gbd: new AliasDefault('git branch --delete --force ${*:::__g-pick-branch --gkcu-returnOutput=1}'),
 
     // PULL(-REBASE)
     gpr: new AliasDefault('git pull --rebase $*'),
     gpro: new AliasDefault('git pull --rebase origin ${*:::git rev-parse --abbrev-ref HEAD}'),
-    gprom: new AliasDefault('git pull --rebase origin master $*'),
+    gprom: new AliasDefault(`git pull --rebase origin \${0:::${GIT_GET_DEFAULT_BRANCH_CMD}} $*`),
     gpru: new AliasDefault('git pull --rebase upstream ${*:::git rev-parse --abbrev-ref HEAD}'),
-    gprum: new AliasDefault('git pull --rebase upstream master $*'),
+    gprum: new AliasDefault(`git pull --rebase upstream \${0:::${GIT_GET_DEFAULT_BRANCH_CMD}} $*`),
 
-    // SYNC MASTER
-    gsync: new AliasDefault('git checkout ${1:master} && git pull upstream ${1:master} && git push origin ${1:master}'),
+    // SYNC DEFAULT BRANCH
+    gsync: new AliasDefault(
+        `git checkout \${1:::${GIT_GET_DEFAULT_BRANCH_CMD}} && ` +
+        `git pull upstream \${1:::${GIT_GET_DEFAULT_BRANCH_CMD}} && ` +
+        `git push origin \${1:::${GIT_GET_DEFAULT_BRANCH_CMD}}`),
 
 
     // REBASE
     grb: new AliasDefault('git rebase ${*:::__g-pick-branch --gkcu-returnOutput=1}'),
-    grbm: new AliasDefault('git rebase --ignore-date master $*'),
+    grbm: new AliasDefault(`git rebase --ignore-date \${0:::${GIT_GET_DEFAULT_BRANCH_CMD}} $*`),
     grbi: new AliasDefault('git rebase --interactive HEAD~$1'),
     grbia: new AliasDefault('git rebase --autosquash --interactive HEAD~$1'),
     grbin: new AliasDefault('git rebase --no-autosquash --interactive HEAD~$1'),
@@ -304,30 +346,30 @@ const ALIASES = {
     }),
     nvu: new Alias({
       default: new AliasSpec(
-        SCRIPT_BACKED_CODE('nvu', 'nvm use $*'),
-        `${SOURCE_NVM_CMD} && nvm use $* (it does not affect the currect process)`),
+          SCRIPT_BACKED_CODE('nvu', 'nvm use $*'),
+          `${SOURCE_NVM_CMD} && nvm use $* (it does not affect the currect process)`),
       win32: new AliasSpec(
-        SCRIPT_BACKED_CODE('nvu', 'nvm use $*'),
-        'nvm use $* (the 1st arg is replaced with the latest available version on the specified branch)'),
+          SCRIPT_BACKED_CODE('nvu', 'nvm use $*'),
+          'nvm use $* (the 1st arg is replaced with the latest available version on the specified branch)'),
     }),
     nvmup: new Alias({
       default: new AliasSpecDefault(
-        PRINT_NVM_UPDATE_INSTRUCTIONS_CODE(
-          `${SOURCE_NVM_CMD} && nvm --version`,
-          'nvm-sh/nvm',
-          'install--update-script',
-          'Run: \'curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v{{version}}/install.sh | bash\' ' +
-            '(or \'wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v{{version}}/install.sh | bash\')',
-        ),
+          PRINT_NVM_UPDATE_INSTRUCTIONS_CODE(
+              `${SOURCE_NVM_CMD} && nvm --version`,
+              'nvm-sh/nvm',
+              'install--update-script',
+              'Run: \'curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v{{version}}/install.sh | bash\' ' +
+              '(or \'wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v{{version}}/install.sh | bash\')',
+          ),
       ),
       win32: new AliasSpecDefault(
-        PRINT_NVM_UPDATE_INSTRUCTIONS_CODE(
-          'nvm version',
-          'coreybutler/nvm-windows',
-          'installation--upgrades',
-          'Download, unzip and run: ' +
-            'https://github.com/coreybutler/nvm-windows/releases/download/{{version}}/nvm-setup.zip',
-        ),
+          PRINT_NVM_UPDATE_INSTRUCTIONS_CODE(
+              'nvm version',
+              'coreybutler/nvm-windows',
+              'installation--upgrades',
+              'Download, unzip and run: ' +
+              'https://github.com/coreybutler/nvm-windows/releases/download/{{version}}/nvm-setup.zip',
+          ),
       ),
     }),
 
@@ -380,8 +422,8 @@ const ALIASES = {
     // SPECIAL
     srv: new AliasDefault('http-server "${1:.}" --port="4000" $2*'),
     srvw: new AliasDefault(
-      'light-server --bind="localhost" --historyindex="/index.html" --serve="${1:.}" --watchexp="${1:.}/**" $2*',
-      {suppressTbj: true}),
+        'light-server --bind="localhost" --historyindex="/index.html" --serve="${1:.}" --watchexp="${1:.}/**" $2*',
+        {suppressTbj: true}),
     naga: new AliasDefault(`npm install --global ${GLOBAL_NPM_PACKAGES.join(' ')} $*`),
     yaga: new AliasDefault(`yarn global add ${GLOBAL_NPM_PACKAGES.filter(x => !/^yarn(?:@|$)/.test(x)).join(' ')} $*`),
   },
@@ -392,7 +434,7 @@ const ALIASES = {
     dkrrm: new AliasDefault('docker stop $1 & docker rm $1 || true'),
     dkrbd: new AliasDefault('docker build --tag $1 $3* $2'),
     dkrrd: new AliasDefault(
-      'docker run -d --name $1 -p 4000:4000 -p 4200:4200 -p 4433:4433 -p 8080:8080 -p 9876:9876 $3* $2'),
+        'docker run -d --name $1 -p 4000:4000 -p 4200:4200 -p 4433:4433 -p 8080:8080 -p 9876:9876 $3* $2'),
     dkratt: new AliasDefault('docker exec -it $1 /bin/bash $2*'),
     dkrall: new AliasDefault('dkrrm $1 && dkrbd $2 $3 && dkrrd $1 $2 $4* && dkratt $1'),
   },
@@ -413,59 +455,36 @@ const ALIASES = {
 
     // PRIVATE
     '__a-builds-dir': SCRIPT_BACKED_ALIAS(
-      'a-builds-dir', '[PRIVATE]: Return the absolute path to \'.../angular/aio/aio-builds-setup/\'.'),
+        'a-builds-dir', '[PRIVATE]: Return the absolute path to \'.../angular/aio/aio-builds-setup/\'.'),
   },
 
   // Env config
   config: {
     // BASH
-    cfgbash: new Alias(new AliasSpec(
-      /* eslint-disable max-len */
-      utils.stripIndentation(`
-        #!/usr/bin/env node
-        'use strict';
-        const utils = require('../../lib/utils');
-        /* eslint-disable max-len */
-        console.log(utils.stripIndentation(\`
-          ### [Generated by: ${VERSION_STAMP}]
-          ### Copy the following into '~/.bashrc':
-
-          # Set up prompt.
-          PS1='\\\\[\\\\033[90m\\\\][\\\\d \\\\t]\\\\[\\\\033[00m\\\\]\\\\n\\\${debian_chroot:+($debian_chroot)}\\\\[\\\\033[01;32m\\\\]\\\\u@\\\\h\\\\[\\\\033[00m\\\\]:\\\\[\\\\033[01;34m\\\\]\\\\w\\\\[\\\\033[00m\\\\]$ ';
-
-          # Improve tab completion.
-          bind "set completion-ignore-case on";
-          bind "set menu-complete-display-prefix on";
-          bind "set show-all-if-ambiguous on";
-          bind "TAB:menu-complete";
-
-        \`));
-        /* eslint-enable max-len */
-
-      `),
-      /* eslint-enable max-len */
-      'Show configuration instructions for `bash`.')),
+    cfgbash: new Alias({
+      default: CFGBASH_SPEC(false),
+      wsl: CFGBASH_SPEC(true),
+    }),
 
 
     // GIT
     cfggit: new Alias({
-      default: CFGGIT_SPEC_WITH_CRED_HELPER('store'),
-      win32: CFGGIT_SPEC_WITH_CRED_HELPER('manager'),
+      default: CFGGIT_SPEC_WITH_CRED_HELPER('manager'),
       wsl: CFGGIT_SPEC_WITH_CRED_HELPER(
-        '/mnt/c/Program\\\\ Files/Git/mingw64/libexec/git-core/git-credential-manager.exe'),
+          '/mnt/c/Program\\\\ Files/Git/mingw64/bin/git-credential-manager-core.exe'),
     }),
 
 
     // VIM
     cfgvim: new Alias(new AliasSpec(
-      utils.stripIndentation(`
-        #!/usr/bin/env node
-        'use strict';
-        console.log('""" [Generated by: ${VERSION_STAMP}]');
-        console.log('""" Copy the following into \\'~/.vimrc\\':\\n');
-        console.log(require('fs').readFileSync(\`\${__dirname}/../../lib/assets/vimrc.txt\`, 'utf8').trim() + '\\n');
-      `),
-      'Show configuration instructions for `vim`.')),
+        utils.stripIndentation(`
+          #!/usr/bin/env node
+          'use strict';
+          console.log('""" [Generated by: ${VERSION_STAMP}]');
+          console.log('""" Copy the following into \\'~/.vimrc\\':\\n');
+          console.log(require('fs').readFileSync(\`\${__dirname}/../../lib/assets/vimrc.txt\`, 'utf8').trim() + '\\n');
+        `),
+        'Show configuration instructions for `vim`.')),
   },
 
   // Misc
@@ -493,29 +512,29 @@ const ALIASES = {
 
     // VERSION
     alv: new Alias(new AliasSpec(
-      utils.stripIndentation(`
-        #!/usr/bin/env node
-        'use strict';
-        console.log('${VERSION_STAMP}');
-      `),
-      `Display the installed version of ${pkg.name}.`)),
+        utils.stripIndentation(`
+          #!/usr/bin/env node
+          'use strict';
+          console.log('${VERSION_STAMP}');
+        `),
+        `Display the installed version of ${pkg.name}.`)),
 
     // HELP
     halp: new Alias(new AliasSpec(
-      utils.stripIndentation(`
-        #!/usr/bin/env node
-        'use strict';
-        require('../../lib/helper').help(...process.argv.slice(2));
-      `),
-      utils.stripIndentation(`
-        Display this message. Variations:
-        - Pass a category name to list aliases of the specified category only.
-          (Example: \`halp node\`)
-        - Pass one or more alias names to list only the specified aliases (if they exist).
-          (Example: \`halp alv\`)
-        - Pass a partial alias name suffixed with \`*\` to list all aliases that start with that value.
-          (Example: \`halp grb*\`)
-      `))),
+        utils.stripIndentation(`
+          #!/usr/bin/env node
+          'use strict';
+          require('../../lib/helper').help(...process.argv.slice(2));
+        `),
+        utils.stripIndentation(`
+          Display this message. Variations:
+          - Pass a category name to list aliases of the specified category only.
+            (Example: \`halp node\`)
+          - Pass one or more alias names to list only the specified aliases (if they exist).
+            (Example: \`halp alv\`)
+          - Pass a partial alias name suffixed with \`*\` to list all aliases that start with that value.
+            (Example: \`halp grb*\`)
+        `))),
   },
 };
 

package/lib/helper.js

@@ -79,8 +79,8 @@ function _help(...names) {
         '                    Does not work with certain types of commands (e.g. `vim`).',
         '',
         utils.wrapLine(
-          '(NOTE: All arguments starting with `--gkcu-` will be ignored when substituting input arguments or ' +
-          'determining their index.)'),
+            '(NOTE: All arguments starting with `--gkcu-` will be ignored when substituting input arguments or ' +
+            'determining their index.)'),
         '',
       ].join('\n');
 

package/lib/utils.js

@@ -30,8 +30,8 @@ function _capitalize(str) {
 
 function _finallyAsPromised(promise, callback) {
   return promise.then(
-    val => Promise.resolve(callback()).then(() => val),
-    err => Promise.resolve(callback()).then(() => Promise.reject(err)));
+      val => Promise.resolve(callback()).then(() => val),
+      err => Promise.resolve(callback()).then(() => Promise.reject(err)));
 }
 
 function _getPlatform() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gkalpak/aliases",
-  "version": "0.9.1",
+  "version": "0.9.4",
   "description": "My global aliases.",
   "keywords": [
     "Utility"
@@ -79,6 +79,7 @@
     "gd": "./bin/git/gd.js",
     "gd1": "./bin/git/gd1.js",
     "gdn": "./bin/git/gdn.js",
+    "gdefb": "./bin/git/gdefb.js",
     "gdn1": "./bin/git/gdn1.js",
     "gdnh": "./bin/git/gdnh.js",
     "gdh": "./bin/git/gdh.js",
@@ -187,17 +188,17 @@
   },
   "dependencies": {
     "@gkalpak/cli-utils": "^0.1.10",
-    "chalk": "^4.1.1",
-    "inquirer": "^8.1.2",
+    "chalk": "^4.1.2",
+    "inquirer": "^8.2.4",
     "is-wsl": "^2.2.0"
   },
   "devDependencies": {
-    "eslint": "^7.31.0",
-    "eslint-plugin-jasmine": "^4.1.2",
-    "jasmine": "^3.8.0",
+    "eslint": "^8.23.0",
+    "eslint-plugin-jasmine": "^4.1.3",
+    "jasmine": "^4.3.0",
     "npm-run-all": "^4.1.5",
-    "shelljs": "^0.8.4",
-    "strip-ansi": "^6.0.0",
+    "shelljs": "^0.8.5",
+    "strip-ansi": "^6.0.1",
     "watch": "^1.0.2"
   }
 }

package/scripts/test-pkg.js

@@ -46,9 +46,9 @@ function checkFile(propName, filePath, rootDir) {
   const missingFile = !existsSync(resolve(rootDir, filePath));
 
   reportResults(
-    `The file mentioned in \`package.json > ${propName}\` exists.`,
-    `The file mentioned in \`package.json > ${propName}\` is missing.`,
-    {'Missing script': missingFile ? [filePath] : []});
+      `The file mentioned in \`package.json > ${propName}\` exists.`,
+      `The file mentioned in \`package.json > ${propName}\` is missing.`,
+      {'Missing script': missingFile ? [filePath] : []});
 }
 
 function compareToAliases(bin, aliases) {
@@ -58,12 +58,12 @@ function compareToAliases(bin, aliases) {
   const {missing, extra} = diff(expected, actual);
 
   reportResults(
-    'Aliases in `lib/constants.js` are in-sync with `package.json > bin`.',
-    'Aliases in `lib/constants.js` are not in-sync with `package.json > bin`.',
-    {
-      'Missing from `package.json > bin`': missing,
-      'Missing from `lib/constants.js`': extra,
-    });
+      'Aliases in `lib/constants.js` are in-sync with `package.json > bin`.',
+      'Aliases in `lib/constants.js` are not in-sync with `package.json > bin`.',
+      {
+        'Missing from `package.json > bin`': missing,
+        'Missing from `lib/constants.js`': extra,
+      });
 }
 
 function compareToBinDir(bin, rootDir) {
@@ -72,9 +72,9 @@ function compareToBinDir(bin, rootDir) {
     filter(path => !existsSync(path));
 
   reportResults(
-    'All scripts mentioned in `package.json > bin` exist.',
-    'Some scripts mentioned in `package.json > bin` are missing.',
-    {'Missing scripts': missingScripts});
+      'All scripts mentioned in `package.json > bin` exist.',
+      'Some scripts mentioned in `package.json > bin` are missing.',
+      {'Missing scripts': missingScripts});
 }
 
 function diff(arr1, arr2) {

package/bin/config/cfggit.win32.js

@@ -1,18 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-const utils = require('../../lib/utils');
-console.log(utils.stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.9.1]
-  ### Run the following commands:
-
-  git config --global core.editor "vim"
-  git config --global credential.helper "manager"
-  git config --global merge.tool "kdiff3"
-  git config --global mergetool.kdiff3.path "/path/to/kdiff3"
-  git config --global mergetool.kdiff3.trustExitCode "false"
-  git config --global push.default "upstream"
-  git config --global rebase.autosquash "true"
-  git config --global rebase.autostash "true"
-  git config --global user.email "kalpakas.g@gmail.com"
-  git config --global user.name "George Kalpakas"
-`));