]> Git [git.vados.ru] :: Repos - Mikrotiks/Mikrotiks.git/commitdiff
edit ros-diff.sh
authorvados-dev <vados@vados.ru>
Thu, 12 Mar 2026 09:21:48 +0000 (12:21 +0300)
committervados-dev <vados@vados.ru>
Thu, 12 Mar 2026 09:21:48 +0000 (12:21 +0300)
bin/ros-diff.sh

index 4dc90d298dabecd33af93bad863352078d24b961..a62a2dfdd4cedfad9c50b58e17622328dc800590 100755 (executable)
@@ -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