From: vados-dev Date: Thu, 12 Mar 2026 09:21:48 +0000 (+0300) Subject: edit ros-diff.sh X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=e81c396010170bc860084e6077ce60e868aded06;p=Mikrotiks%2FMikrotiks.git edit ros-diff.sh --- diff --git a/bin/ros-diff.sh b/bin/ros-diff.sh index 4dc90d2..a62a2df 100755 --- a/bin/ros-diff.sh +++ b/bin/ros-diff.sh @@ -56,7 +56,7 @@ DEFAULT_CONNECT_ATTEMPTS=5 DEFAULT_CONNECT_TIMEOUT=5 DEFAULT_SSH_KEY=${HomeDir}"/.ssh/id_rsa" # Set default diff args: -DEFAULT_DIFF_ARGS="--ignore-matching-lines='by RouterOS'" +DEFAULT_DIFF_ARGS=(--ignore-matching-lines="by RouterOS") # # Set debug and log options: DEBUG_OUT=true @@ -287,10 +287,10 @@ compare_config() { local config_file="${1}" local precedent_file="${2}" local diff_file="${3}" - local diff_args=${DEFAULT_DIFF_ARGS} + local diff_args=("${DEFAULT_DIFF_ARGS[@]}") local log_msg - warning "diff ${diff_args} ${config_file} ${precedent_file} > ${diff_file}" - diff ${diff_args} ${config_file} ${precedent_file} >${diff_file} + warning "diff ${diff_args[*]} ${config_file} ${precedent_file} > ${diff_file}" + diff "${diff_args[@]}" ${config_file} ${precedent_file} >${diff_file} exit 0 if [ "$?" -ne "0" ]; then log_msg="- There is a difference! Create backup..." @@ -552,6 +552,7 @@ log_success "${log_msg}" done <<<"$(echo -e $HR)" LogFile="${DEFAULT_LOG}" +RouterName="" # echo -ne "\\r[${BAR_SIZE:0:percBar}] $perc %" #echo "[] $perc %" done