From 2c74ef80740666db9bfe4a44a5ff26584c283253 Mon Sep 17 00:00:00 2001
From: Ben Grande <ben.grande.b@gmail.com>
Date: Fri, 16 Aug 2024 12:03:13 +0200
Subject: [PATCH] fix: avoid operand evaluation as argument

---
 salt/sys-bitcoin/configure-builder-source.sls | 18 +++++++++---------
 salt/sys-bitcoin/configure-builder.sls        |  2 +-
 salt/sys-cacher/install.sls                   |  4 ++--
 salt/sys-mirage-firewall/create.sls           |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/salt/sys-bitcoin/configure-builder-source.sls b/salt/sys-bitcoin/configure-builder-source.sls
index b79e517..cd6661c 100644
--- a/salt/sys-bitcoin/configure-builder-source.sls
+++ b/salt/sys-bitcoin/configure-builder-source.sls
@@ -125,8 +125,8 @@ include:
     - require:
       - cmd: "{{ slsdotpath }}-source-build-make-install"
     - name: |
-        \mkdir -p share/bitcoin
-        \cp -v ~/src/bitcoin/README.md share/bitcoin/
+        \mkdir -p -- share/bitcoin
+        \cp -v -- ~/src/bitcoin/README.md share/bitcoin/
     - cwd: /home/user/bitcoin-build
     - runas: user
 
@@ -135,7 +135,7 @@ include:
     - require:
       - cmd: "{{ slsdotpath }}-source-build-make-install"
     - name: |
-        \cp -v ~/src/bitcoin/share/examples/bitcoin.conf bitcoin.conf
+        \cp -v -- ~/src/bitcoin/share/examples/bitcoin.conf bitcoin.conf
     - cwd: /home/user/bitcoin-build
     - runas: user
 
@@ -144,8 +144,8 @@ include:
     - require:
       - cmd: "{{ slsdotpath }}-source-build-make-install"
     - name: |
-        \mkdir -p share/bash-completion/completions/
-        \cp -v ~/src/bitcoin/contrib/completions/bash/* share/bash-completion/completions/
+        \mkdir -p -- share/bash-completion/completions/
+        \cp -v -- ~/src/bitcoin/contrib/completions/bash/* share/bash-completion/completions/
     - cwd: /home/user/bitcoin-build
     - runas: user
 
@@ -154,8 +154,8 @@ include:
     - require:
       - cmd: "{{ slsdotpath }}-source-build-make-install"
     - name: |
-        \mkdir -p share/rpcauth
-        \cp -v ~/src/bitcoin/share/rpcauth/rpcauth.py share/rpcauth/
+        \mkdir -p -- share/rpcauth
+        \cp -v -- ~/src/bitcoin/share/rpcauth/rpcauth.py share/rpcauth/
     - cwd: /home/user/bitcoin-build
     - runas: user
 
@@ -164,8 +164,8 @@ include:
     - require:
       - cmd: "{{ slsdotpath }}-source-build-make-install"
     - name: |
-        \mkdir -p share/icons/hicolor/scalable/apps/
-        \cp -v ~/src/bitcoin/src/qt/res/src/bitcoin.svg share/icons/hicolor/scalable/apps/
+        \mkdir -p -- share/icons/hicolor/scalable/apps/
+        \cp -v -- ~/src/bitcoin/src/qt/res/src/bitcoin.svg share/icons/hicolor/scalable/apps/
     - cwd: /home/user/bitcoin-build
     - runas: user
 
diff --git a/salt/sys-bitcoin/configure-builder.sls b/salt/sys-bitcoin/configure-builder.sls
index 9403470..7b3a8a7 100644
--- a/salt/sys-bitcoin/configure-builder.sls
+++ b/salt/sys-bitcoin/configure-builder.sls
@@ -66,7 +66,7 @@ include:
     ## Multiple detached signatures has bad UX with GPG.
     - name: |
         trusted_sigs_number="4"
-        read_sigs_number="$(GNUPGHOME=/home/user/.gnupg/bitcoin/ gpg --status-fd=2 --verify SHA256SUMS.asc 2>&1 | grep -c "^\[GNUPG:\] GOODSIG \S\+ ")"
+        read_sigs_number="$(GNUPGHOME=/home/user/.gnupg/bitcoin/ gpg --status-fd=2 --verify SHA256SUMS.asc 2>&1 | grep -c -e "^\[GNUPG:\] GOODSIG \S\+ ")"
         if test "${trusted_sigs_number}" != "${read_sigs_number}"; then
           exit 1
         fi
diff --git a/salt/sys-cacher/install.sls b/salt/sys-cacher/install.sls
index 4d06c53..fcf6e8b 100644
--- a/salt/sys-cacher/install.sls
+++ b/salt/sys-cacher/install.sls
@@ -44,7 +44,7 @@ include:
 
 "{{ slsdotpath }}-copy-package-config-to-qubes-cacher-config":
   cmd.run:
-    - name: cp -rp /etc/apt-cacher-ng/* /etc/qusal-apt-cacher-ng
+    - name: cp -rp -- /etc/apt-cacher-ng/* /etc/qusal-apt-cacher-ng
 
 "{{ slsdotpath }}-systemd-service":
   file.managed:
@@ -57,7 +57,7 @@ include:
 
 "{{ slsdotpath }}-update-deb_mirrors.gz":
   cmd.run:
-    - name: cp /usr/lib/apt-cacher-ng/deb_mirrors.gz /etc/qusal-apt-cacher-ng/deb_mirrors.gz
+    - name: cp -- /usr/lib/apt-cacher-ng/deb_mirrors.gz /etc/qusal-apt-cacher-ng/deb_mirrors.gz
     - runas: root
 
 "{{ slsdotpath }}-update-conf":
diff --git a/salt/sys-mirage-firewall/create.sls b/salt/sys-mirage-firewall/create.sls
index 13b5537..317a455 100644
--- a/salt/sys-mirage-firewall/create.sls
+++ b/salt/sys-mirage-firewall/create.sls
@@ -37,7 +37,7 @@ the chain (sys-net).
       - qvm: "sys-mirage-firewall-start-updatevm-{{ updatevm }}"
     - name: |
         qvm-run {{ updatevm }} -- "
-          mkdir -p /tmp/mirage-firewall-download
+          mkdir -p -- /tmp/mirage-firewall-download
           cd /tmp/mirage-firewall-download
           curl --location \
             --connect-timeout 10 \
@@ -58,7 +58,7 @@ the chain (sys-net).
     - require:
       - cmd: "sys-mirage-firewall-fetch-tarball"
     - name:
-        qvm-run --pass-io {{ updatevm }} -- "cat /tmp/mirage-firewall-download/mirage-firewall.tar.bz2" | tee /tmp/mirage-firewall.tar.bz2 >/dev/null
+        qvm-run --pass-io {{ updatevm }} -- "cat /tmp/mirage-firewall-download/mirage-firewall.tar.bz2" | tee -- /tmp/mirage-firewall.tar.bz2 >/dev/null
     - runas: user
     - timeout: 10