Git-Mirrors/qusal
1
0
Fork 0
mirror of https://github.com/ben-grande/qusal.git synced 2024-10-01 02:35:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: avoid operand evaluation as argument

Browse Source
This commit is contained in:
Ben Grande 2024-08-16 12:03:13 +02:00
parent 59a7fd2c4f
commit 2c74ef8074
No known key found for this signature in database
GPG Key ID: 00C64E14F51F9E56
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
salt/sys-bitcoin/configure-builder-source.sls
View File

@ -125,8 +125,8 @@ include:
- require: - require:
- cmd: "{{ slsdotpath }}-source-build-make-install" - cmd: "{{ slsdotpath }}-source-build-make-install"
- name: | - name: |
\mkdir -p share/bitcoin \mkdir -p -- share/bitcoin
\cp -v ~/src/bitcoin/README.md share/bitcoin/ \cp -v -- ~/src/bitcoin/README.md share/bitcoin/
- cwd: /home/user/bitcoin-build - cwd: /home/user/bitcoin-build
- runas: user - runas: user
@ -135,7 +135,7 @@ include:
- require: - require:
- cmd: "{{ slsdotpath }}-source-build-make-install" - cmd: "{{ slsdotpath }}-source-build-make-install"
- name: | - 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 - cwd: /home/user/bitcoin-build
- runas: user - runas: user
@ -144,8 +144,8 @@ include:
- require: - require:
- cmd: "{{ slsdotpath }}-source-build-make-install" - cmd: "{{ slsdotpath }}-source-build-make-install"
- name: | - name: |
\mkdir -p share/bash-completion/completions/ \mkdir -p -- share/bash-completion/completions/
\cp -v ~/src/bitcoin/contrib/completions/bash/* share/bash-completion/completions/ \cp -v -- ~/src/bitcoin/contrib/completions/bash/* share/bash-completion/completions/
- cwd: /home/user/bitcoin-build - cwd: /home/user/bitcoin-build
- runas: user - runas: user
@ -154,8 +154,8 @@ include:
- require: - require:
- cmd: "{{ slsdotpath }}-source-build-make-install" - cmd: "{{ slsdotpath }}-source-build-make-install"
- name: | - name: |
\mkdir -p share/rpcauth \mkdir -p -- share/rpcauth
\cp -v ~/src/bitcoin/share/rpcauth/rpcauth.py share/rpcauth/ \cp -v -- ~/src/bitcoin/share/rpcauth/rpcauth.py share/rpcauth/
- cwd: /home/user/bitcoin-build - cwd: /home/user/bitcoin-build
- runas: user - runas: user
@ -164,8 +164,8 @@ include:
- require: - require:
- cmd: "{{ slsdotpath }}-source-build-make-install" - cmd: "{{ slsdotpath }}-source-build-make-install"
- name: | - name: |
\mkdir -p 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/ \cp -v -- ~/src/bitcoin/src/qt/res/src/bitcoin.svg share/icons/hicolor/scalable/apps/
- cwd: /home/user/bitcoin-build - cwd: /home/user/bitcoin-build
- runas: user - runas: user

2
salt/sys-bitcoin/configure-builder.sls
View File

@ -66,7 +66,7 @@ include:
## Multiple detached signatures has bad UX with GPG. ## Multiple detached signatures has bad UX with GPG.
- name: | - name: |
trusted_sigs_number="4" 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 if test "${trusted_sigs_number}" != "${read_sigs_number}"; then
exit 1 exit 1
fi fi

4
salt/sys-cacher/install.sls
View File

@ -44,7 +44,7 @@ include:
"{{ slsdotpath }}-copy-package-config-to-qubes-cacher-config": "{{ slsdotpath }}-copy-package-config-to-qubes-cacher-config":
cmd.run: 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": "{{ slsdotpath }}-systemd-service":
file.managed: file.managed:
@ -57,7 +57,7 @@ include:
"{{ slsdotpath }}-update-deb_mirrors.gz": "{{ slsdotpath }}-update-deb_mirrors.gz":
cmd.run: 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 - runas: root
"{{ slsdotpath }}-update-conf": "{{ slsdotpath }}-update-conf":

4
salt/sys-mirage-firewall/create.sls
View File

@ -37,7 +37,7 @@ the chain (sys-net).
- qvm: "sys-mirage-firewall-start-updatevm-{{ updatevm }}" - qvm: "sys-mirage-firewall-start-updatevm-{{ updatevm }}"
- name: | - name: |
qvm-run {{ updatevm }} -- " qvm-run {{ updatevm }} -- "
mkdir -p /tmp/mirage-firewall-download mkdir -p -- /tmp/mirage-firewall-download
cd /tmp/mirage-firewall-download cd /tmp/mirage-firewall-download
curl --location \ curl --location \
--connect-timeout 10 \ --connect-timeout 10 \
@ -58,7 +58,7 @@ the chain (sys-net).
- require: - require:
- cmd: "sys-mirage-firewall-fetch-tarball" - cmd: "sys-mirage-firewall-fetch-tarball"
- name: - 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 - runas: user
- timeout: 10 - timeout: 10