From 1bb5236960830a30705336e1aa27669c5bf3e2e5 Mon Sep 17 00:00:00 2001
From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com>
Date: Tue, 21 Jul 2020 14:23:56 -0500
Subject: [PATCH] Fixes

---
 lib/linter.sh     |  4 ++--
 lib/validation.sh | 60 +++++++++++++++++++++++------------------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lib/linter.sh b/lib/linter.sh
index 714709a0..aa4fbcb7 100755
--- a/lib/linter.sh
+++ b/lib/linter.sh
@@ -23,10 +23,10 @@ source /action/lib/worker.sh # Source the function script(s)
 ###########
 # Ansible Vars
 ANSIBLE_FILE_NAME='.ansible-lint.yml'                                   # Name of the file
-ANSIBLE_LINTER_RULES="$DEFAULT_RULES_LOCATION/$ANSIBLE_FILE_NAME"       # Path to the Ansible lint rules
+ANSIBLE_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${ANSIBLE_FILE_NAME}"   # Path to the Ansible lint rules
 # Azure Resource Manager Vars
 ARM_FILE_NAME='.arm-ttk.psd1'                                           # Name of the file
-ARM_LINTER_RULES="$DEFAULT_RULES_LOCATION/$ARM_FILE_NAME"               # Path to the ARM lint rules
+ARM_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${ARM_FILE_NAME}"           # Path to the ARM lint rules
 # Cloudformation Vars
 CFN_FILE_NAME='.cfnlintrc.yml'                                          # Name of the file
 CFN_LINTER_RULES="$DEFAULT_RULES_LOCATION/$CFN_FILE_NAME"               # Path to the cloudformation lint rules
diff --git a/lib/validation.sh b/lib/validation.sh
index 8d784e09..e5ef62f3 100755
--- a/lib/validation.sh
+++ b/lib/validation.sh
@@ -84,36 +84,36 @@ function GetValidationInfo() {
   # Determine if any linters were explicitly set #
   ################################################
   ANY_SET="false"
-  if [[ -n $VALIDATE_ANSIBLE || -n \
-    $VALIDATE_ARM || -n \
-    $VALIDATE_BASH || -n \
-    $VALIDATE_CLOJURE || -n \
-    $VALIDATE_COFFEE || -n \
-    $VALIDATE_CSS || -n \
-    $VALIDATE_DART || -n \
-    $VALIDATE_DOCKER || -n \
-    $VALIDATE_EDITORCONFIG || -n \
-    $VALIDATE_ENV || -n \
-    $VALIDATE_GO || -n \
-    $VALIDATE_HTML || -n \
-    $VALIDATE_JAVASCRIPT_ES || -n \
-    $VALIDATE_JAVASCRIPT_STANDARD || -n \
-    $VALIDATE_JSON || -n \
-    $VALIDATE_KOTLIN || -n \
-    $VALIDATE_MARKDOWN || -n \
-    $VALIDATE_OPENAPI || -n \
-    $VALIDATE_PERL || -n \
-    $VALIDATE_PHP || -n \
-    $VALIDATE_POWERSHELL || -n \
-    $VALIDATE_PROTOBUF || -n \
-    $VALIDATE_PYTHON || -n \
-    $VALIDATE_RAKU || -n \
-    $VALIDATE_RUBY || -n \
-    $VALIDATE_TERRAFORM || -n \
-    $VALIDATE_TYPESCRIPT_ES || -n \
-    $VALIDATE_TYPESCRIPT_STANDARD || -n \
-    $VALIDATE_XML || -n \
-    $VALIDATE_YAML ]]; then
+  if [[ -n ${VALIDATE_ANSIBLE} || -n \
+    ${VALIDATE_ARM} || -n \
+    ${VALIDATE_BASH} || -n \
+    ${VALIDATE_CLOJURE} || -n \
+    ${VALIDATE_COFFEE} || -n \
+    ${VALIDATE_CSS} || -n \
+    ${VALIDATE_DART} || -n \
+    ${VALIDATE_DOCKER} || -n \
+    ${VALIDATE_EDITORCONFIG} || -n \
+    ${VALIDATE_ENV} || -n \
+    ${VALIDATE_GO} || -n \
+    ${VALIDATE_HTML} || -n \
+    ${VALIDATE_JAVASCRIPT_ES} || -n \
+    ${VALIDATE_JAVASCRIPT_STANDARD} || -n \
+    ${VALIDATE_JSON} || -n \
+    ${VALIDATE_KOTLIN} || -n \
+    ${VALIDATE_MARKDOWN} || -n \
+    ${VALIDATE_OPENAPI} || -n \
+    ${VALIDATE_PERL} || -n \
+    ${VALIDATE_PHP} || -n \
+    ${VALIDATE_POWERSHELL} || -n \
+    ${VALIDATE_PROTOBUF} || -n \
+    ${VALIDATE_PYTHON} || -n \
+    ${VALIDATE_RAKU} || -n \
+    ${VALIDATE_RUBY} || -n \
+    ${VALIDATE_TERRAFORM} || -n \
+    ${VALIDATE_TYPESCRIPT_ES} || -n \
+    ${VALIDATE_TYPESCRIPT_STANDARD} || -n \
+    ${VALIDATE_XML} || -n \
+    ${VALIDATE_YAML} ]]; then
     ANY_SET="true"
   fi