fix(linter): fix linting issues

ruzickap · Jan 4, 2023 · 1c4a2c1 · 1c4a2c1
1 parent 9bd213c
commit 1c4a2c1
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -197,7 +197,7 @@ with Packer.
 
 ```bash
 git clone --recurse-submodules https://github.com/ruzickap/packer-templates.git
-cd packer-templates
+cd packer-templates || exit
 ```
 
 * Ubuntu:

diff --git a/docs/GitLab_CI_configuration.md b/docs/GitLab_CI_configuration.md
@@ -42,7 +42,7 @@ You can also use the command directly when using already pre-configured server:
 gitlab-runner register \
   --non-interactive \
   --tag-list packer-templates \
-  --registration-token {{ GITLAB_REGISTRATION_TOKEN }} \
+  --registration-token "{{ GITLAB_REGISTRATION_TOKEN }}" \
   --url https://gitlab.com/ \
   --executor shell
 ```
diff --git a/templates/my_centos.md b/templates/my_centos.md
@@ -34,9 +34,8 @@ apt install -y libvirt-bin vagrant-libvirt
 Install and connect to the box:
 
 ```bash
-mkdir ${NAME}
-cd ${NAME}
-vagrant init ${VAGRANT_CLOUD_USER}/${NAME}
+mkdir "${NAME}" && cd "${NAME}" || exit
+vagrant init "${VAGRANT_CLOUD_USER}/${NAME}"
 VAGRANT_DEFAULT_PROVIDER=libvirt vagrant up
 # or
 VAGRANT_DEFAULT_PROVIDER=virtualbox vagrant up

diff --git a/templates/my_ubuntu.md b/templates/my_ubuntu.md
@@ -33,9 +33,8 @@ apt install -y libvirt-bin vagrant-libvirt
 Install and connect to the box:
 
 ```bash
-mkdir ${NAME}
-cd ${NAME}
-vagrant init ${VAGRANT_CLOUD_USER}/${NAME}
+mkdir "${NAME}" && cd "${NAME}" || exit
+vagrant init "${VAGRANT_CLOUD_USER}/${NAME}"
 VAGRANT_DEFAULT_PROVIDER=libvirt vagrant up
 # or
 VAGRANT_DEFAULT_PROVIDER=virtualbox vagrant up

diff --git a/templates/my_windows-10-enterprise-eval.md b/templates/my_windows-10-enterprise-eval.md
@@ -36,7 +36,7 @@ web pages:
 dnf remove vagrant
 
 VAGRANT_LATEST_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/vagrant | jq -r -M '.current_version')
-dnf install https://releases.hashicorp.com/vagrant/${VAGRANT_LATEST_VERSION}/vagrant_${VAGRANT_LATEST_VERSION}_x86_64.rpm
+dnf install "https://releases.hashicorp.com/vagrant/${VAGRANT_LATEST_VERSION}/vagrant_${VAGRANT_LATEST_VERSION}_x86_64.rpm"
 
 # virtualbox
 # Details here: https://rpmfusion.org/Howto/VirtualBox
@@ -51,9 +51,8 @@ vagrant plugin install vagrant-libvirt
 Install and connect to the box:
 
 ```bash
-mkdir ${NAME}
-cd ${NAME}
-vagrant init ${VAGRANT_CLOUD_USER}/${NAME}
+mkdir "${NAME}" && cd "${NAME}" || exit
+vagrant init "${VAGRANT_CLOUD_USER}/${NAME}"
 VAGRANT_DEFAULT_PROVIDER=libvirt vagrant up
 # or
 VAGRANT_DEFAULT_PROVIDER=virtualbox vagrant up

diff --git a/templates/ubuntu.md b/templates/ubuntu.md
@@ -34,9 +34,8 @@ apt install -y libvirt-bin vagrant-libvirt
 Install and connect to the box:
 
 ```bash
-mkdir ${NAME}
-cd ${NAME}
-vagrant init ${VAGRANT_CLOUD_USER}/${NAME}
+mkdir "${NAME}" && cd "${NAME}" || exit
+vagrant init "${VAGRANT_CLOUD_USER}/${NAME}"
 VAGRANT_DEFAULT_PROVIDER=libvirt vagrant up
 # or
 VAGRANT_DEFAULT_PROVIDER=virtualbox vagrant up

diff --git a/templates/windows-10-enterprise-eval.md b/templates/windows-10-enterprise-eval.md
@@ -36,7 +36,7 @@ web pages:
 dnf remove vagrant
 
 VAGRANT_LATEST_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/vagrant | jq -r -M '.current_version')
-dnf install https://releases.hashicorp.com/vagrant/${VAGRANT_LATEST_VERSION}/vagrant_${VAGRANT_LATEST_VERSION}_x86_64.rpm
+dnf install "https://releases.hashicorp.com/vagrant/${VAGRANT_LATEST_VERSION}/vagrant_${VAGRANT_LATEST_VERSION}_x86_64.rpm"
 
 # virtualbox
 # Details here: https://rpmfusion.org/Howto/VirtualBox
@@ -51,9 +51,8 @@ vagrant plugin install vagrant-libvirt
 Install and connect to the box:
 
 ```bash
-mkdir ${NAME}
-cd ${NAME}
-vagrant init ${VAGRANT_CLOUD_USER}/${NAME}
+mkdir "${NAME}" && cd "${NAME}" || exit
+vagrant init "${VAGRANT_CLOUD_USER}/${NAME}"
 VAGRANT_DEFAULT_PROVIDER=libvirt vagrant up
 # or
 VAGRANT_DEFAULT_PROVIDER=virtualbox vagrant up

diff --git a/templates/windows-server-2012-eval.md b/templates/windows-server-2012-eval.md
@@ -37,7 +37,7 @@ web pages:
 dnf remove vagrant
 
 VAGRANT_LATEST_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/vagrant | jq -r -M '.current_version')
-dnf install https://releases.hashicorp.com/vagrant/${VAGRANT_LATEST_VERSION}/vagrant_${VAGRANT_LATEST_VERSION}_x86_64.rpm
+dnf install "https://releases.hashicorp.com/vagrant/${VAGRANT_LATEST_VERSION}/vagrant_${VAGRANT_LATEST_VERSION}_x86_64.rpm"
 
 # virtualbox
 # Details here: https://rpmfusion.org/Howto/VirtualBox
@@ -52,9 +52,8 @@ vagrant plugin install vagrant-libvirt
 Install and connect to the box:
 
 ```bash
-mkdir ${NAME}
-cd ${NAME}
-vagrant init ${VAGRANT_CLOUD_USER}/${NAME}
+mkdir "${NAME}" && cd "${NAME}" || exit
+vagrant init "${VAGRANT_CLOUD_USER}/${NAME}"
 VAGRANT_DEFAULT_PROVIDER=libvirt vagrant up
 # or
 VAGRANT_DEFAULT_PROVIDER=virtualbox vagrant up

diff --git a/templates/windows-server-2016-eval.md b/templates/windows-server-2016-eval.md
@@ -36,7 +36,7 @@ web pages:
 dnf remove vagrant
 
 VAGRANT_LATEST_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/vagrant | jq -r -M '.current_version')
-dnf install https://releases.hashicorp.com/vagrant/${VAGRANT_LATEST_VERSION}/vagrant_${VAGRANT_LATEST_VERSION}_x86_64.rpm
+dnf install "https://releases.hashicorp.com/vagrant/${VAGRANT_LATEST_VERSION}/vagrant_${VAGRANT_LATEST_VERSION}_x86_64.rpm"
 
 # virtualbox
 # Details here: https://rpmfusion.org/Howto/VirtualBox
@@ -51,9 +51,8 @@ vagrant plugin install vagrant-libvirt
 Install and connect to the box:
 
 ```bash
-mkdir ${NAME}
-cd ${NAME}
-vagrant init ${VAGRANT_CLOUD_USER}/${NAME}
+mkdir "${NAME}" && cd "${NAME}" || exit
+vagrant init "${VAGRANT_CLOUD_USER}/${NAME}"
 VAGRANT_DEFAULT_PROVIDER=libvirt vagrant up
 # or
 VAGRANT_DEFAULT_PROVIDER=virtualbox vagrant up

diff --git a/templates/windows-server-2019-eval.md b/templates/windows-server-2019-eval.md
@@ -36,7 +36,7 @@ web pages:
 dnf remove vagrant
 
 VAGRANT_LATEST_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/vagrant | jq -r -M '.current_version')
-dnf install https://releases.hashicorp.com/vagrant/${VAGRANT_LATEST_VERSION}/vagrant_${VAGRANT_LATEST_VERSION}_x86_64.rpm
+dnf install "https://releases.hashicorp.com/vagrant/${VAGRANT_LATEST_VERSION}/vagrant_${VAGRANT_LATEST_VERSION}_x86_64.rpm"
 
 # virtualbox
 # Details here: https://rpmfusion.org/Howto/VirtualBox
@@ -51,9 +51,8 @@ vagrant plugin install vagrant-libvirt
 Install and connect to the box:
 
 ```bash
-mkdir ${NAME}
-cd ${NAME}
-vagrant init ${VAGRANT_CLOUD_USER}/${NAME}
+mkdir "${NAME}" && cd "${NAME}" || exit
+vagrant init "${VAGRANT_CLOUD_USER}/${NAME}"
 VAGRANT_DEFAULT_PROVIDER=libvirt vagrant up
 # or
 VAGRANT_DEFAULT_PROVIDER=virtualbox vagrant up

diff --git a/templates/windows-server-2022-eval.md b/templates/windows-server-2022-eval.md
@@ -36,7 +36,7 @@ web pages:
 dnf remove vagrant
 
 VAGRANT_LATEST_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/vagrant | jq -r -M '.current_version')
-dnf install https://releases.hashicorp.com/vagrant/${VAGRANT_LATEST_VERSION}/vagrant_${VAGRANT_LATEST_VERSION}_x86_64.rpm
+dnf install "https://releases.hashicorp.com/vagrant/${VAGRANT_LATEST_VERSION}/vagrant_${VAGRANT_LATEST_VERSION}_x86_64.rpm"
 
 # virtualbox
 # Details here: https://rpmfusion.org/Howto/VirtualBox
@@ -51,9 +51,8 @@ vagrant plugin install vagrant-libvirt
 Install and connect to the box:
 
 ```bash
-mkdir ${NAME}
-cd ${NAME}
-vagrant init ${VAGRANT_CLOUD_USER}/${NAME}
+mkdir "${NAME}" && cd "${NAME}" || exit
+vagrant init "${VAGRANT_CLOUD_USER}/${NAME}"
 VAGRANT_DEFAULT_PROVIDER=libvirt vagrant up
 # or
 VAGRANT_DEFAULT_PROVIDER=virtualbox vagrant up

diff --git a/tools/build_all.sh b/tools/build_all.sh
@@ -10,9 +10,9 @@ PACKER_IMAGES_OUTPUT_DIR="/var/tmp/packer-templates-images"
   for PACKER_VAGRANT_PROVIDER in libvirt virtualbox; do
     for BUILD in ubuntu-{20,18,16}.04-desktop-amd64 ubuntu-{20,18,16}.04-server-amd64 my_ubuntu-{20,18,16}.04-server-amd64 my_centos-7-x86_64 {my_,}windows-10-enterprise-x64-eval windows-server-{2022,2019,2016,2012_r2}-standard-x64-eval; do
       echo "**** $(date)"
-      ./build.sh ${BUILD}-${PACKER_VAGRANT_PROVIDER}
+      ./build.sh "${BUILD}-${PACKER_VAGRANT_PROVIDER}"
     done
   done
 
   ./vagrant_init_destroy_boxes.sh ${PACKER_IMAGES_OUTPUT_DIR}/*.box
-) 2>&1 | tee $LOGFILE
+) 2>&1 | tee "${LOGFILE}"
diff --git a/tools/test_remote_boxes.sh b/tools/test_remote_boxes.sh
@@ -13,7 +13,7 @@ VAGRANT_CLOUD_USER="peru"
 
   for PACKER_VAGRANT_PROVIDER in libvirt virtualbox; do
     for BOX in {my_,}windows-10-enterprise-x64-eval windows-server-{2019,2016,2012_r2}-standard-x64-eval; do
-      BOX_CURRENT_VERSION=$(curl -s https://vagrantcloud.com/api/v1/box/${VAGRANT_CLOUD_USER}/${BOX} | jq -r '.current_version.number')
+      BOX_CURRENT_VERSION=$(curl -s "https://vagrantcloud.com/api/v1/box/${VAGRANT_CLOUD_USER}/${BOX}" | jq -r '.current_version.number')
       echo "*** ${VAGRANT_CLOUD_USER}/${BOX} | ${BOX_CURRENT_VERSION}"
       wget -c "https://vagrantcloud.com/${VAGRANT_CLOUD_USER}/boxes/${BOX}/versions/${BOX_CURRENT_VERSION}/providers/${PACKER_VAGRANT_PROVIDER}.box" -O "${PACKER_IMAGES_OUTPUT_DIR}/${BOX}-${PACKER_VAGRANT_PROVIDER}.box"
     done