Git-Mirrors/qusal
1
0
Fork 0
mirror of https://github.com/ben-grande/qusal.git synced 2025-06-24 06:14:27 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix: avoid echo usage

Browse source 
Echo can interpret operand as an option and checking every variable to
be echoed is troublesome while with printf, if the format specifier is
present before the operand, printing as string can be enforced.
This commit is contained in:
Ben Grande 2024-08-06 18:15:24 +02:00
parent 1b2f1ba941
commit bdd4c789c1
No known key found for this signature in database
GPG key ID: 00C64E14F51F9E56
52 changed files with 318 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

10
salt/sys-ssh-agent/files/server/bin/qvm-ssh-agent
View file

@ -9,7 +9,7 @@ set -eu
service="qusal-ssh-agent"
usage(){
echo "Usage: ${0##*/} [ls|add] <AGENT>
printf '%s\n' "Usage: ${0##*/} [ls|add] <AGENT>
ls: list agent(s)
add: add keys to agent(s)
reload: reload/re-add keys from agent(s)
@ -23,8 +23,8 @@ Example:
ls_agent(){
socket="/tmp/${service}/${agent}.sock"
test -S "${socket}" || return 1
agent="$(echo "${socket}" | sed -e "s|.*${service}/||;s/\.sock//")"
echo "Agent: (${agent}) ${socket}"
agent="$(printf '%s\n' "${socket}" | sed -e "s|.*${service}/||;s/\.sock//")"
printf '%s\n' "Agent: (${agent}) ${socket}"
SSH_AUTH_SOCK="${socket}" ssh-add -l || true
}
@ -33,7 +33,7 @@ add_agent(){
mkdir -m 0700 -p -- "/tmp/${service}"
dir="${HOME}/.ssh/identities.d/${agent}"
if ! test -d "${dir}"; then
echo "Directory not found: ${dir}" >&2
printf '%s\n' "Directory not found: ${dir}" >&2
return 1
fi
dir="${dir##*/}"
@ -48,7 +48,7 @@ add_agent(){
keys="$(grep -sl -e "-----BEGIN OPENSSH PRIVATE KEY-----" \
-- "${HOME}/.ssh/identities.d/${dir}"/* || true)"
if test -z "${keys}"; then
echo "Directory has no key: ${dir}" >&2
printf '%s\n' "Directory has no key: ${dir}" >&2
return 1
fi
SSH_AUTH_SOCK="${socket}" ssh-add -D 2>/dev/null || true