diff --git a/keymanagement.sh b/keymanagement.sh index 04c1dd1..cb2ec2a 100644 --- a/keymanagement.sh +++ b/keymanagement.sh @@ -45,11 +45,11 @@ function ssh-init-agent() { local ECHO="/bin/echo" local SSH_AGENT="/usr/bin/ssh-agent" - [[ -e "${SSH_AGENT_FILE}" ]] && eval `${CAT} "${SSH_AGENT_FILE}"` >/dev/null + [[ -e "${SSH_AGENT_FILE}" ]] && eval $(${CAT} "${SSH_AGENT_FILE}") >/dev/null if [[ "x" != x${SSH_AGENT_PID} ]] then - if [[ "ssh-agent" = "`${PS} -p ${SSH_AGENT_PID} -o comm=`" ]] + if [[ "ssh-agent" = "$(${PS} -p ${SSH_AGENT_PID} -o comm=)" ]] then return fi @@ -59,7 +59,7 @@ function ssh-init-agent() { ${SSH_AGENT} >"${SSH_AGENT_FILE}" if [[ 0 -eq $? ]] then - eval `${CAT} "${SSH_AGENT_FILE}"` >/dev/null + eval $(${CAT} "${SSH_AGENT_FILE}") >/dev/null ${ECHO} "OK" ssh-add else diff --git a/tools/background b/tools/background index 1db8664..e9c0d37 100755 --- a/tools/background +++ b/tools/background @@ -29,7 +29,6 @@ function background() { local TEMPFILE="/bin/tempfile" local IDENTIFY="/usr/bin/identify" local CONVERT="/usr/bin/convert" - local SETROOT="/usr/bin/feh" local ECHO="/bin/echo" local EXPR="/usr/bin/expr" local WC="/usr/bin/wc"