From 112f3f3daf56dcc1f7e446a84ad0bed9a0c8d7b7 Mon Sep 17 00:00:00 2001
From: Vijay A <avijayr@protonmail.com>
Date: Thu, 13 May 2021 21:15:28 +0530
Subject: Minor refactoring to have consistent command-line invocations.

---
 .travis.yml       | 6 +++---
 CONTRIBUTING.md   | 6 +++---
 appveyor.yml      | 2 +-
 gulpfile.babel.js | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b87e47c02..e09c1f08a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,9 +58,9 @@ before_install:
     fi
 install:
   - npm cache clean -f || travis_terminate 1
-  - npm uninstall node-gyp && travis_retry npm install -g node-gyp@8.0.0 || travis_terminate 1
-  - npm uninstall node-sass && travis_retry npm install -g node-sass@5.0.0 || travis_terminate 1
-  - cd recipes && npm install && npm run package && cd .. || travis_terminate 1
+  - travis_retry npm uninstall node-gyp node-sass || travis_terminate 1
+  - travis_retry npm i -g node-gyp@8.0.0 node-sass@5.0.0 || travis_terminate 1
+  - cd recipes && npm i && npm run package && cd .. || travis_terminate 1
   - travis_retry npx lerna bootstrap || travis_terminate 1
 before_script:
   - npm run lint && npm run test || travis_terminate 1
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index efcc4eac3..d4a3ef02c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -85,7 +85,7 @@ dnf install libX11-devel libXext-devel libXScrnSaver-devel libxkbfile-devel rpm
 Please make sure you run this command as an administrator:
 
 ```bash
-npm install --global windows-build-tools --vs2015
+npm i -g windows-build-tools --vs2015
 ```
 
 ### Clone repository with submodule
@@ -101,6 +101,7 @@ It is important you execute the last command to get the required submodules (rec
 ### Local caching of dependencies
 
 Set these env vars into your profile (or if you use [direnv](https://direnv.net/), you can manage them via the respective `.envrc` file)
+
 ```bash
 export ELECTRON_CACHE=$HOME/.cache/electron
 export ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
@@ -127,8 +128,7 @@ npm run rebuild
 Ferdi requires its recipes to be packaged before it can use it. When running Ferdi as a development instance, you'll need to package the local recipes before you can create any services inside Ferdi.
 
 ```bash
-cd recipes
-npm install && npm run package
+cd recipes && npm i && npm run package
 ```
 
 ### Using Docker to build an rpm package
diff --git a/appveyor.yml b/appveyor.yml
index da1ea0e61..7fd061523 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -22,7 +22,7 @@ install:
   - appveyor-retry git submodule update --init --recursive
   - ps: Update-NodeJsInstallation $env:nodejs_version
   - cmd: set NODE_OPTIONS=--max-old-space-size=2048
-  - cd recipes && npm install && npm run package && cd ..
+  - cd recipes && npm i && npm run package && cd ..
   - appveyor-retry npx lerna bootstrap
 
 before_build:
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 407bd3b31..9a04732b7 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -15,10 +15,10 @@ import { removeSync, outputJson } from 'fs-extra';
 import kebabCase from 'kebab-case';
 import hexRgb from 'hex-rgb';
 
+import * as buildInfo from 'preval-build-info';
 import config from './package.json';
 
 import * as rawStyleConfig from './src/theme/default/legacy.js';
-import * as buildInfo from 'preval-build-info';
 
 dotenv.config();
 
-- 
cgit v1.2.3-54-g00ecf