From 93b6e223329705634a21bc372d92880835e73438 Mon Sep 17 00:00:00 2001
From: "Brian M. Schilder" <34280215+bschilder@users.noreply.github.com>
Date: Sun, 10 Dec 2023 17:50:28 +0000
Subject: [PATCH] Further adjust bash syntax; reduce workflow steps

---
 .github/workflows/rworkflows.yml |  8 +++-----
 action.yml                       | 17 ++++++++---------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/rworkflows.yml b/.github/workflows/rworkflows.yml
index 8f24d9f7..0df8453a 100644
--- a/.github/workflows/rworkflows.yml
+++ b/.github/workflows/rworkflows.yml
@@ -46,13 +46,11 @@ jobs:
         run_covr: ${{ true }}
         run_pkgdown: ${{ true }}
         has_runit: ${{ false }}
-        has_latex: ${{ true }}
+        # has_latex: ${{ true }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run_docker: ${{ true }}
-        docker_user: bschilder
-        docker_org: neurogenomicslab
         DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
         runner_os: ${{ runner.os }}
         cache_version: cache-v1
-        free_diskspace: ${{ true }}
-        miniforge_variant: false
+        # free_diskspace: ${{ true }}
+        # miniforge_variant: false
diff --git a/action.yml b/action.yml
index d32530f5..778dcbca 100644
--- a/action.yml
+++ b/action.yml
@@ -453,7 +453,7 @@ runs:
     - name: ℹ️ Get R package info 
       if: runner.os == 'Linux'
       run: |
-        #### DockerHub repos must be lowercase (,,) ####
+        #### Docker repos must be lowercase (,,) ####
         name=$(grep '^Package:' DESCRIPTION | cut -d\   -f2)
         echo "packageName=${name,,}" >> $GITHUB_ENV
         echo "packageNameOrig=${name}" >> $GITHUB_ENV
@@ -463,15 +463,14 @@ runs:
         echo $version
         echo "BASE_IMAGE=${{ matrix.config.cont }}" >> $GITHUB_ENV
         #### Adjust docker args depending on docker_registry ####
-        if ${{ inputs.docker_registry }}=="docker.io"; 
-        then
-          echo "dockerOrg=${ inputs.docker_org,, }" >> $GITHUB_ENV
-          echo "dockerUser=${ inputs.docker_user }" >> $GITHUB_ENV
-          echo "dockerPass=${ inputs.DOCKER_TOKEN }" >> $GITHUB_ENV
+        if [[ "$inputs.docker_registry" != "docker.io" ]]; then
+          echo "dockerOrg=${inputs.docker_org,,}" >> $GITHUB_ENV
+          echo "dockerUser=${inputs.docker_user}" >> $GITHUB_ENV
+          echo "dockerPass=${inputs.DOCKER_TOKEN}" >> $GITHUB_ENV
         else
-          echo "dockerOrg=${ github.repository_owner,, }" >> $GITHUB_ENV
-          echo "dockerUser=${ github.repository_owner }" >> $GITHUB_ENV
-          echo "dockerPass=${ inputs.GITHUB_TOKEN }" >> $GITHUB_ENV
+          echo "dockerOrg=${github.repository_owner,,}" >> $GITHUB_ENV
+          echo "dockerUser=${github.repository_owner}" >> $GITHUB_ENV
+          echo "dockerPass=${inputs.GITHUB_TOKEN}" >> $GITHUB_ENV
         fi
       shell: bash {0}