diff --git a/salt/dom0/files/bin/qubes-kde-win-rules b/salt/dom0/files/bin/qubes-kde-win-rules index a351b02..7755c37 100755 --- a/salt/dom0/files/bin/qubes-kde-win-rules +++ b/salt/dom0/files/bin/qubes-kde-win-rules @@ -1,6 +1,6 @@ #!/bin/sh -# SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. +# SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -26,9 +26,9 @@ writeconf(){ value="$3" group_id="$(grep -B1 -e "^Description=${group}$" -- "${file}" | head -1 | - tr -d "[" | tr -d "]")" + tr -d "\[\]")" if test -z "${group_id}"; then - highest_id="$(grep -e "\[[0-9]\+\]" -- "${file}" | tr -d "[" | tr -d "]" | + highest_id="$(grep -e "\[[0-9]\+\]" -- "${file}" | tr -d "\[\]" | sort | tail -1)" if test -n "${highest_id}"; then group_id="$((highest_id+1))" diff --git a/salt/sys-bitcoin/files/server/bin/bitcoin-dbcache b/salt/sys-bitcoin/files/server/bin/bitcoin-dbcache index ec2dde6..6410a08 100755 --- a/salt/sys-bitcoin/files/server/bin/bitcoin-dbcache +++ b/salt/sys-bitcoin/files/server/bin/bitcoin-dbcache @@ -6,12 +6,10 @@ set -eu conf="${HOME}/.bitcoin/conf.d/dbcache.conf" -domid="$(xenstore-read -- domid)" -xenstore_mem_dir="/local/domain/${domid}/memory" if test -f /var/run/qubes-service/meminfo-writer; then - mem_KiB="$(xenstore-read -- "${xenstore_mem_dir}/hotplug-max")" + mem_KiB="$(xenstore-read -- memory/hotplug-max)" else - mem_KiB="$(xenstore-read -- "${xenstore_mem_dir}/static-max")" + mem_KiB="$(xenstore-read -- memory/static-max)" fi cache_MiB=$((mem_KiB/1024)) cache="$((cache_MiB*80/100))"