Merge pull request #790 from LaurentGoderre/fix-shfmt

Fixed new shfmt issue

Author: LaurentGoderre

.travis.yml

@@ -56,7 +56,7 @@ jobs:
       env:
         - TEST: shfmt check
       script:
-        - docker run -it --rm -v "$(pwd)":/sh -w /sh jamesmstone/shfmt -i 2 -l -w -ci .
+        - docker run -it --rm -v "$(pwd)":/sh -w /sh jamesmstone/shfmt@sha256:4eff05b54e87c11e8214848de3e5f4bb47a4241b99ac5c6554db5cc164015810 -i 2 -l -w -ci .
         - git diff --color
         - git diff --stat=220 --color --exit-code
 

travis.yml.template

@@ -54,7 +54,7 @@ jobs:
       env:
         - TEST: shfmt check
       script:
-        - docker run -it --rm -v "$(pwd)":/sh -w /sh jamesmstone/shfmt -i 2 -l -w -ci .
+        - docker run -it --rm -v "$(pwd)":/sh -w /sh jamesmstone/shfmt@sha256:4eff05b54e87c11e8214848de3e5f4bb47a4241b99ac5c6554db5cc164015810 -i 2 -l -w -ci .
         - git diff --color
         - git diff --stat=220 --color --exit-code
 

update.sh

@@ -72,7 +72,7 @@ function update_node_version() {
     # Add GPG keys
     for key_type in "node" "yarn"; do
       while read -r line; do
-        pattern="\"\\$\\{$(echo "${key_type}" | tr '[:lower:]' '[:upper:]')_KEYS\\[@\\]\\}\""
+        pattern='"\$\{'$(echo "${key_type}" | tr '[:lower:]' '[:upper:]')'_KEYS\[@\]\}"'
         sed -Ei -e "s/([ \\t]*)(${pattern})/\\1${line}${new_line}\\1\\2/" "${dockerfile}"
       done <"keys/${key_type}.keys"
       sed -Ei -e "/${pattern}/d" "${dockerfile}"