From 2d5ee612b89138b13dcf24fa100582c8c7cdf75e Mon Sep 17 00:00:00 2001
From: Pierre Fenoll <pierrefenoll@gmail.com>
Date: Sun, 1 Jul 2018 23:13:20 +0200
Subject: 21: build otp21 on latest alpine + fix latest shellcheck warnings
 (#286)

---
 .circleci/config.yml | 18 ++++++++++++++----
 kerl                 | 12 ++++++------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b555249..b1f3638 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,6 +3,7 @@ workflows:
   version: 2
   test-workflow:
     jobs:
+      - alpine_21
       - alpine3.7_20.3
       - centos7_19.3
       - centos6_18.3
@@ -12,14 +13,14 @@ workflows:
 
 jobs:
 
-  alpine3.7_20.3:
+  alpine_21:
     docker:
-      - image: alpine:3.7
+      - image: alpine
     environment:
-      - _KERL_VSN: 20.3
+      - _KERL_VSN: '21.0.1'
       - KERL_BUILD_BACKEND: git
       - KERL_BUILD_DOCS: 'yes'
-    steps:
+    steps: &alpine_steps
       - run: apk update && apk upgrade
       - run: |
           apk add curl ca-certificates \
@@ -45,6 +46,15 @@ jobs:
       - run: ./kerl delete installation $(./kerl path install_$_KERL_VSN)
       - run: ./kerl delete build "$_KERL_VSN"
 
+  alpine3.7_20.3:
+    docker:
+      - image: alpine:3.7
+    environment:
+      - _KERL_VSN: 20.3
+      - KERL_BUILD_BACKEND: git
+      - KERL_BUILD_DOCS: 'yes'
+    steps: *alpine_steps
+
   centos7_19.3:
     docker:
       - image: centos:7
diff --git a/kerl b/kerl
index 33d7f2a..ae869b0 100755
--- a/kerl
+++ b/kerl
@@ -330,8 +330,8 @@ assert_build_name_unused() {
 }
 
 _check_required_pkgs() {
-    has_dpkg=$(which dpkg)
-    has_rpm=$(which rpm)
+    has_dpkg=$(command -v dpkg)
+    has_rpm=$(command -v rpm)
     if [ -n "$has_dpkg" ] || [ -n "$has_rpm" ]; then
         # found either dpkg or rpm (or maybe even both!)
         if [ -n "$has_dpkg" ] && [ -n "$has_rpm" ]; then
@@ -450,7 +450,7 @@ get_perl_version() {
 }
 
 assert_perl() {
-    perl_loc=$(which perl)
+    perl_loc=$(command -v perl)
     if [ -z "$perl_loc" ]; then
         return 1
     else
@@ -460,7 +460,7 @@ assert_perl() {
 }
 
 get_javac_version() {
-    java_loc=$(which javac)
+    java_loc=$(command -v javac)
     if [ -z "$java_loc" ]; then
         # Java's not installed, so just return 0
         0
@@ -637,7 +637,7 @@ _do_build() {
             case "$OSVERSION" in
                 17*|16*|15*)
                     if ! echo "$KERL_CONFIGURE_OPTIONS" | grep 'ssl' >/dev/null 2>&1; then
-                        whichbrew=$(which brew)
+                        whichbrew=$(command -v brew)
                         if [ -n "$whichbrew" ] && [ -x "$whichbrew" ]; then
                             brew_prefix=$(brew --prefix openssl)
                             if [ -n "$brew_prefix" ] && [ -d "$brew_prefix" ]; then
@@ -1115,7 +1115,7 @@ ACTIVATE_CSH
         build_plt "$absdir"
     fi
 
-    if which apk >/dev/null 2>&1; then
+    if command -v apk >/dev/null 2>&1; then
         # Running on Alpine Linux, assuming non-exotic shell
         SHELL_SUFFIX=''
     else
-- 
cgit v1.2.3