Merge pull request #30 from hurrymaplelad/shellcheck

Lint with Shellcheck

Author: hurrymaplelad

.travis.yml

@@ -1,2 +1,13 @@
 language: node_js
 node_js: node
+# Lint and test in parallel
+script:
+  - npm run lint
+  - npm test
+# from https://github.com/koalaman/shellcheck#travis-ci-setup
+addons:
+  apt:
+    sources:
+    - debian-sid    # Grab ShellCheck from the Debian repo
+    packages:
+    - shellcheck

bin/plugin_root

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 #
 # Writes the full path to the root of this plugin to standard out.
 # Use to source or run files in libexec/

etc/nodenv.d/version-name/package-json-engine.bash

@@ -1,8 +1,11 @@
+#!/bin/bash
+
+# shellcheck source=libexec/nodenv-package-json-engine
 source "$(plugin_root)/libexec/nodenv-package-json-engine"
 
 if ! NODENV_PACKAGE_JSON_VERSION=$(get_version_respecting_precedence); then
   echo "package-json-engine: no version satisfying \`$(get_expression_respecting_precedence)' installed" >&2
   exit 1
 elif [ -n "$NODENV_PACKAGE_JSON_VERSION" ]; then
-  NODENV_VERSION="${NODENV_PACKAGE_JSON_VERSION}"
+  export NODENV_VERSION="${NODENV_PACKAGE_JSON_VERSION}"
 fi

etc/nodenv.d/version-origin/package-json-engine.bash

@@ -1,6 +1,9 @@
+#!/bin/bash
+
+# shellcheck source=libexec/nodenv-package-json-engine
 source "$(plugin_root)/libexec/nodenv-package-json-engine"
 
 ENGINES_EXPRESSION=$(get_expression_respecting_precedence);
 if [ -n "$ENGINES_EXPRESSION" ]; then
-  NODENV_VERSION_ORIGIN="package-json-engine matching $ENGINES_EXPRESSION"
+  export NODENV_VERSION_ORIGIN="package-json-engine matching $ENGINES_EXPRESSION"
 fi

libexec/nodenv-package-json-engine

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 #
 # If a custom Node version is not already defined, we look
 # for a Node version semver expressing in the current tree's package.json.
@@ -13,32 +13,32 @@
 package_json_has_precedence() {
   if [[ ( -z "$(nodenv local 2>/dev/null)" )
   && ( -z "$(nodenv sh-shell 2>/dev/null)" ) ]]; then
-    exit;
+    return;
   else
-    exit 1;
+    return 1;
   fi
 }
 
 find_package_json_path() {
-  local root="$1"
+  root="$1"
   while [ -n "$root" ]; do
     if [ -e "${root}/package.json" ]; then
       echo "${root}/package.json"
-      exit
+      return
     fi
     root="${root%/*}"
   done
 }
 
 extract_version_from_package_json() {
-  local package_json_path="$1"
-  local version_regex='"node":[ \t]*"([^"]*)"'
+  package_json_path="$1"
+  version_regex='"node":[ \t]*"([^"]*)"'
   [[ $(cat "$package_json_path") =~ $version_regex ]]
   echo "${BASH_REMATCH[1]}"
 }
 
 find_installed_verion_matching_expression() {
-  local version_expression="$1"
+  version_expression="$1"
   local -a installed_versions
   while IFS= read -r v; do
     installed_versions+=( "$v" )
@@ -52,32 +52,30 @@ find_installed_verion_matching_expression() {
 SEMVER="$(plugin_root)/node_modules/sh-semver/semver.sh"
 
 get_version_respecting_precedence() {
-  if ! $(package_json_has_precedence); then
-    exit
-  fi
+  if ! package_json_has_precedence; then return; fi
 
-  local package_json_path=$(find_package_json_path "$PWD")
-  if [ ! -e "$package_json_path" ]; then exit; fi
+  package_json_path=$(find_package_json_path "$PWD")
+  if [ ! -e "$package_json_path" ]; then return; fi
 
-  local version_expression=$(
+  version_expression=$(
     extract_version_from_package_json "$package_json_path"
   )
-  if [ -z "$version_expression" ]; then exit; fi
+  if [ -z "$version_expression" ]; then return; fi
 
-  local version=$(
+  version=$(
     find_installed_verion_matching_expression "$version_expression"
   )
-  if [ -z "$version" ]; then exit 1; fi
+  if [ -z "$version" ]; then return 1; fi
   echo "$version"
 }
 
 get_expression_respecting_precedence() {
-  if ! $(package_json_has_precedence); then exit; fi
+  if ! package_json_has_precedence; then return; fi
 
-  local package_json_path=$(find_package_json_path "$PWD")
-  if [ ! -e "$package_json_path" ]; then exit; fi
+  package_json_path=$(find_package_json_path "$PWD")
+  if [ ! -e "$package_json_path" ]; then return; fi
 
-  local version_expression=$(
+  version_expression=$(
     extract_version_from_package_json "$package_json_path"
   )
   echo "$version_expression"

package.json

@@ -22,6 +22,7 @@
     "test": "test"
   },
   "scripts": {
+    "lint": "git ls-files bin etc libexec | xargs shellcheck",
     "pretest": "[ -d $npm_package_directories_testnodenv ] || git clone --quiet --depth 1 https://github.com/nodenv/nodenv $npm_package_directories_testnodenv",
     "test": "PATH=$PWD/$npm_package_directories_testnodenv/bin:$PATH bats ${CI:+--tap} test",
     "publish:brew": "brew-publish $npm_package_name v$npm_package_version",