From 5a704ec503ce4452226db6cd09405e3b3afa92e9 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Tue, 12 Nov 2024 12:22:41 -0700
Subject: [PATCH] adjusting for command line arguments

---
 .github/workflows/test-linux.yml | 9 ++++++---
 .github/workflows/test-macos.yml | 9 ++++++---
 bootstrap-salt.sh                | 4 +---
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index d9165a9..8213054 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -71,7 +71,7 @@ jobs:
           vt_parms=$(echo "${{ matrix.instance }}" | sed 's/-/ /')
           vt_parms2=$(echo "$vt_parms" | sed 's/-/./')
           vt_parm_ver=$(echo "$vt_parms2" | awk -F ' ' '{print $2}')
-          echo "bt parms ,$vt_parms, vt_parms2 ,$vt_parms2, vt_parms_ver ,$vt_parm_ver,"
+          echo "vt parms ,$vt_parms, vt_parms2 ,$vt_parms2, vt_parms_ver ,$vt_parm_ver,"
           echo "SaltVersion=$vt_parm_ver" >> $GITHUB_ENV
 
       - name: Bootstrap Salt
@@ -80,8 +80,11 @@ jobs:
           echo "matrix instance ,${{ matrix.instance }},"
           bt_parms=$(echo "${{ matrix.instance }}" | sed 's/-/ /')
           bt_parms2=$(echo "$bt_parms" | sed 's/-/./')
-          echo "bt parms ,$bt_parms, bt_parms2 ,$bt_parms2,"
-          sudo sh -x ./bootstrap-salt.sh "$bt_parms2"
+          bt_arg1=$(echo "$bt_parms2" | awk -F ' ' '{print $1}')
+          bt_arg2=$(echo "$bt_parms2" | awk -F ' ' '{print $2}')
+          echo "bt parms ,$bt_parms, bt_parms2 ,$bt_parms2, bt_arg1 ,$bt_arg1, bt_arg2 ,$bt_arg2,"
+          ## sudo sh -x ./bootstrap-salt.sh "$bt_parms2"
+          sudo sh -x ./bootstrap-salt.sh "$bt_arg1" "$bt_arg2"
 
       - name: Test Bootstrap
         run: |
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index 45519f4..88f6d7a 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -61,7 +61,7 @@ jobs:
           vt_parms=$(echo "${{ matrix.instance }}" | sed 's/-/ /')
           vt_parms2=$(echo "$vt_parms" | sed 's/-/./')
           vt_parm_ver=$(echo "$vt_parms2" | awk -F ' ' '{print $2}')
-          echo "bt parms ,$vt_parms, vt_parms2 ,$vt_parms2, vt_parms_ver ,$vt_parm_ver,"
+          echo "vt parms ,$vt_parms, vt_parms2 ,$vt_parms2, vt_parms_ver ,$vt_parm_ver,"
           echo "SaltVersion=$vt_parm_ver" >> $GITHUB_ENV
 
       - name: Bootstrap Salt
@@ -70,8 +70,11 @@ jobs:
           echo "matrix instance ,${{ matrix.instance }},"
           bt_parms=$(echo "${{ matrix.instance }}" | sed 's/-/ /')
           bt_parms2=$(echo "$bt_parms" | sed 's/-/./')
-          echo "bt parms ,$bt_parms, bt_parms2 ,$bt_parms2,"
-          sudo sh -x ./bootstrap-salt.sh "$bt_parms2"
+          bt_arg1=$(echo "$bt_parms2" | awk -F ' ' '{print $1}')
+          bt_arg2=$(echo "$bt_parms2" | awk -F ' ' '{print $2}')
+          echo "bt parms ,$bt_parms, bt_parms2 ,$bt_parms2, bt_arg1 ,$bt_arg1, bt_arg2 ,$bt_arg2,"
+          ## sudo sh -x ./bootstrap-salt.sh "$bt_parms2"
+          sudo sh -x ./bootstrap-salt.sh "$bt_arg1" "$bt_arg2"
 
       - name: Test Bootstrap
         run: |
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 3006848..d5a47e3 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -618,9 +618,7 @@ __check_services_systemd_functional
 # Define installation type
 if [ "$#" -gt 0 ];then
     __check_unparsed_options "$*"
-    ## DGM ITYPE=$1
-    # get first arguement
-    ITYPE=$(echo $1 | awk -F ' ' '{print $1}')
+    ITYPE=$1
     shift
 fi