From 89bc6bed94dc4cb526ab6817f17a9d8c4632f38b Mon Sep 17 00:00:00 2001
From: awalsh128 <awalsh128@gmail.com>
Date: Fri, 3 Feb 2023 22:03:09 -0800
Subject: [PATCH] Address block style package issue #84 #88

---
 action.yml | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/action.yml b/action.yml
index 1e77dd8..839998b 100644
--- a/action.yml
+++ b/action.yml
@@ -45,12 +45,17 @@ runs:
       run: |
         ${GITHUB_ACTION_PATH}/pre_cache_action.sh \
           ~/cache-apt-pkgs \
-          "${{ inputs.version }}" \
-          "${{ inputs.execute_install_scripts }}" \
-          "${{ inputs.debug }}" \
-          ${{ inputs.packages }}
+          "$VERSION" \
+          "$EXEC_INSTALL_SCRIPTS" \
+          "$DEBUG" \
+          "$PACKAGES"
         echo "CACHE_KEY=$(cat ~/cache-apt-pkgs/cache_key.md5)" >> $GITHUB_ENV
       shell: bash
+      env:
+         VERSION: "${{ inputs.version }}"
+         EXEC_INSTALL_SCRIPTS: "${{ inputs.execute_install_scripts }}"
+         DEBUG: "${{ inputs.debug }}"
+         PACKAGES: "${{ inputs.packages }}"
 
     - id: load-cache
       uses: actions/cache@v3
@@ -63,17 +68,22 @@ runs:
         ${GITHUB_ACTION_PATH}/post_cache_action.sh \
           ~/cache-apt-pkgs \
           / \
-          "${{ steps.load-cache.outputs.cache-hit }}" \
-          "${{ inputs.execute_install_scripts }}" \
-          "${{ inputs.debug }}" \
-          ${{ inputs.packages }}
+          "$CACHE_HIT" \
+          "$EXEC_INSTALL_SCRIPTS" \
+          "$DEBUG" \
+          "$PACKAGES"
         function create_list { local list=$(cat ~/cache-apt-pkgs/manifest_${1}.log | tr '\n' ','); echo ${list:0:-1}; };
         echo "package-version-list=$(create_list main)" >> $GITHUB_OUTPUT
         echo "all-package-version-list=$(create_list all)" >> $GITHUB_OUTPUT
       shell: bash
+      env:
+         CACHE_HIT: "${{ steps.load-cache.outputs.cache-hit }}"
+         EXEC_INSTALL_SCRIPTS: "${{ inputs.execute_install_scripts }}"
+         DEBUG: "${{ inputs.debug }}"
+         PACKAGES: "${{ inputs.packages }}"
 
     - id: upload-logs
-      if: ${{ inputs.debug }} == "true"
+      if: ${{ inputs.debug == 'true' }}
       uses: actions/upload-artifact@v3
       with:
         name: cache-apt-pkgs-logs%${{ inputs.packages }}%${{ inputs.version }}