From 1539061bbeb48e189bb8484f706aad2df39bcfba Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Wed, 3 Nov 2021 15:38:39 +0800 Subject: [PATCH] mkdumprd: use array to store ssh arguments in mkdir_save_path_ssh upstream: fedora resolves: bz2003832 conflict: none commit 3a4b0351d0f31de739a2aae794e0e2af7fcc4942 Author: Kairui Song Date: Wed Aug 18 15:45:20 2021 +0800 mkdumprd: use array to store ssh arguments in mkdir_save_path_ssh For storing arguments, plain string is not a good choice. Array is preferred: See: https://github.com/koalaman/shellcheck/wiki/SC2089 Signed-off-by: Kairui Song Acked-by: Philipp Rudo Signed-off-by: Tao Liu --- mkdumprd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mkdumprd b/mkdumprd index f4af6ca..fa2c8e2 100644 --- a/mkdumprd +++ b/mkdumprd @@ -111,20 +111,20 @@ get_ssh_size() { mkdir_save_path_ssh() { local _opt _dir - _opt="-i $SSH_KEY_LOCATION -o BatchMode=yes -o StrictHostKeyChecking=yes" - ssh -qn $_opt $1 mkdir -p $SAVE_PATH 2>&1 > /dev/null + _opt=(-i "$SSH_KEY_LOCATION" -o BatchMode=yes -o StrictHostKeyChecking=yes) + ssh -qn "${_opt[@]}" $1 mkdir -p $SAVE_PATH 2>&1 > /dev/null _ret=$? if [ $_ret -ne 0 ]; then perror_exit "mkdir failed on $1:$SAVE_PATH" fi #check whether user has write permission on $1:$SAVE_PATH - _dir=$(ssh -qn $_opt $1 mktemp -dqp $SAVE_PATH 2>/dev/null) + _dir=$(ssh -qn "${_opt[@]}" $1 mktemp -dqp $SAVE_PATH 2>/dev/null) _ret=$? if [ $_ret -ne 0 ]; then perror_exit "Could not create temporary directory on $1:$SAVE_PATH. Make sure user has write permission on destination" fi - ssh -qn $_opt $1 rmdir $_dir + ssh -qn "${_opt[@]}" $1 rmdir $_dir return 0 }