فهرست منبع

returned the download of the wireless package for ROS 7

Dmitriev Roman 7 ماه پیش
والد
کامیت
a33b6389ab
4فایلهای تغییر یافته به همراه34 افزوده شده و 26 حذف شده
  1. 0 24
      download_ros.sh
  2. 24 0
      functions.sh
  3. 0 1
      ros6_functions.sh
  4. 10 1
      ros7_functions.sh

+ 0 - 24
download_ros.sh

@@ -31,30 +31,6 @@ if [ -n "${force}" ]; then
     log "Force flag for download packages found!"
 fi
 
-# Функция для преобразования версии в числовой формат
-version_to_number() {
-    local version=$1
-    local major=$(echo $version | cut -d. -f1)
-    local minor=$(echo $version | cut -d. -f2)
-    local patch=$(echo $version | cut -d. -f3)
-    echo $((major * 1000000 + minor * 1000 + patch))
-}
-
-# Функция для определения типа версии и нужного user agent
-get_ros7_user_agent() {
-    local version=$1
-    local version_num=$(version_to_number "$version")
-    local threshold_num=$(version_to_number "7.12.1")
-    
-    if [ $version_num -ge $threshold_num ]; then
-        # Версия равна или выше 7.12.1
-        echo "after"
-    else
-        # Версия ниже 7.12.1
-        echo "before"
-    fi
-}
-
 # Функция для загрузки конкретной версии
 download_specific_version() {
     local version=$1

+ 24 - 0
functions.sh

@@ -53,6 +53,30 @@ download_additional_files() {
     done
 }
 
+# Функция для преобразования версии в числовой формат
+version_to_number() {
+    local version=$1
+    local major=$(echo $version | cut -d. -f1)
+    local minor=$(echo $version | cut -d. -f2)
+    local patch=$(echo $version | cut -d. -f3)
+    echo $((major * 1000000 + minor * 1000 + patch))
+}
+
+# Функция для определения типа версии и нужного user agent
+get_ros7_user_agent() {
+    local version=$1
+    local version_num=$(version_to_number "$version")
+    local threshold_num=$(version_to_number "7.12.1")
+    
+    if [ $version_num -ge $threshold_num ]; then
+        # Версия равна или выше 7.12.1
+        echo "after"
+    else
+        # Версия ниже 7.12.1
+        echo "before"
+    fi
+}
+
 # Функция загрузки Winbox
 download_winbox() {
     log "Downloading Winbox"

+ 0 - 1
ros6_functions.sh

@@ -103,6 +103,5 @@ download_specific_ros6_version() {
     # Download additional files
     download_additional_files "${version}"
 
-    log_success "ROS 6 version ${version} downloaded successfully."
     return 0
 }

+ 10 - 1
ros7_functions.sh

@@ -84,6 +84,16 @@ download_specific_ros7_version() {
             download_err=1
             break
         fi
+
+        local user_agent_info=$(get_ros7_user_agent "$version")
+        if [ "${file_arch}" != "x86" ] && [ "${user_agent_info}" == 'after' ]; then
+            #download wireless after 7.12
+	    ${WGET} $WGET_OPTS -U "$user_agent" "http://upgrade.mikrotik.com/routeros/${version}/wireless-${version}-${file_arch}.npk"
+	    if ! check_error $? "Failed to download wireless for ${file_arch}"; then
+        	download_err=1
+        	break
+		fi
+	    fi
     done
 
     if [[ ${download_err} -ne 0 ]]; then
@@ -94,6 +104,5 @@ download_specific_ros7_version() {
     # Additional files
     download_additional_files "${version}" "$user_agent"
 
-    log_success "ROS 7 version ${version} downloaded successfully."
     return 0
 }