From ffccbad8ace4f1dad2f3439bf0af2c510e2c529a Mon Sep 17 00:00:00 2001 From: WXbet <57314510+WXbet@users.noreply.github.com> Date: Thu, 19 Mar 2020 17:31:20 +0100 Subject: [PATCH] s3.TUP optimimize preselection (v0.11.3) Library Update Menu Logical change in preselection of libs. Only existing libraries with lower versions in the toolchain are now preselected for the update. Colorize of version numbers (green=uptodate;magenta=updatable) --- support/functions/_plugin_update_toolchain | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/support/functions/_plugin_update_toolchain b/support/functions/_plugin_update_toolchain index 63ae398..a7ad495 100644 --- a/support/functions/_plugin_update_toolchain +++ b/support/functions/_plugin_update_toolchain @@ -3,7 +3,7 @@ #simplebuild_plugin tcupdate tcupdate(){ - pversion="0.11.2"; + pversion="0.11.3"; pname="s3.TUP"; pdesc="Plugin $pname v$pversion"; configname="$configdir/plugin_update_toolchain.config"; @@ -165,9 +165,13 @@ tcupdate(){ libexports="$i"_exports[@];libexports=("${!libexports}"); libconfigure="$i"_configure[@];libconfigure=("${!libconfigure}"); libmake="$i"_make[@];libmake=("${!libmake}"); - - MENU_OPTIONS+=("$i" "$libname $libversion $([ $libversioncurrent ] && echo $libversioncompare) $(echo $libversioncurrent | sed -e 's/^$/ ---/g')" "$([ $libversioncurrent ] && echo "on" || echo "off")" "$([ $libname ] && echo "$libname $libversion: $liburl")");counter; + #Preselection and formatting + [ "$libversioncompare" == "=" ] && libtxtfmt="\Z2" || libtxtfmt=""; + [ "$libversioncompare" == ">" ] && [ ${#libversioncurrent} -gt 0 ] && libselected="on" && libtxtfmt="\Z5" || libselected="off"; + + MENU_OPTIONS+=("$i" "$libname $libversion $([ $libversioncurrent ] && echo $libversioncompare) $libtxtfmt$(echo $libversioncurrent | sed -e 's/^$/ ---/g')\Zn" "$(echo $libselected)" "$([ $libname ] && echo "$libname $libversion: $liburl")");counter; + # 0 key 1 desc 2 version 3 checkversion 4 checkfile 5 current version 6 url 7 tasks array lib=("$libkey" "$libname" "$libversion" "$libversioncheck" "$libcheck" "$libversioncurrent" "$liburl" "(${libtasks[*]@Q})"); libs+=("(${lib[*]@Q})");