diff --git a/support/functions/_plugin_update_toolchain b/support/functions/_plugin_update_toolchain index 56bf0a4..310596e 100644 --- a/support/functions/_plugin_update_toolchain +++ b/support/functions/_plugin_update_toolchain @@ -3,7 +3,7 @@ #simplebuild_plugin tcupdate tcupdate(){ - pversion="0.20.3"; + pversion="0.20.4"; pname="s3.TUP"; pdesc="Plugin $pname v$pversion"; configname="$configdir/plugin_update_toolchain.config"; @@ -136,6 +136,7 @@ tcupdate(){ _check_toolchain $tc && _backup "$tc" "$tc" >/dev/null || [ -z "$CMDTC" ] && sleep 2 && tcupdate "$CMDTC" "$OPTION1" "$OPTION2" "$FLAG" || _nl && exit; sleep 2;; 3) #Exit + unset MENU_OPTIONS; [ "$FLAG" == "1" ] && return || bye;; esac; done; @@ -240,7 +241,15 @@ _integrate_libs(){ opts=$(echo "$opts" | tr ' ' '\n' | sort -hr); #SSL select check - [ $(echo $opts | tr ' ' '\n' | grep -c "SSL_") -gt 1 ] && echo -e "${r_l}\n\n${txt_s3tup_msg_choose_ssl}${re_}" && sleep 3 && [ "${#OPTION1}" -gt 0 ] && menu_close=1 && continue; + if [ $(echo -e "$opts" | grep -c "SSL") -gt 1 \ + -o $(echo -e "$opts" | grep -c "USB") -gt 1 \ + -o $(echo -e "$opts" | grep -c "PCSC") -gt 1 \ + -o $(echo -e "$opts" | grep -c "CCID") -gt 1 \ + -o $(echo -e "$opts" | grep -c "ZLIB") -gt 1 ];then + echo -e "${r_l}\n\n${txt_s3tup_menu_library_wrong_selection}\n${y_l}${opts}${re_}" + [ "${#OPTION1}" -gt 0 ] && menu_close=1; + sleep 3 && continue; + fi; case $ret in 0) #Start - Build library @@ -269,6 +278,7 @@ _integrate_libs(){ [ -d "$tmpdir" ] && rm -r "$tmpdir";; 1) #Exit/Back + unset MENU_OPTIONS; menu_close="1"; return;; 2) #Info @@ -521,6 +531,7 @@ _create_tc(){ tpl=$(echo "$opts" | awk '{printf $2}';); _tpl_editor "$(_get_template_type "$cttpldir/$tpl" | awk -F';' '{print $1}' | xargs)" "$tpl";; 3) #Exit + unset MENU_OPTIONS; menu_close="1"; return;; esac; diff --git a/support/translation/bg b/support/translation/bg index 043ddbc..267794d 100644 --- a/support/translation/bg +++ b/support/translation/bg @@ -128,7 +128,6 @@ txt_s3tup_msg_reset_config5="You can change/extend them to fit your needs." txt_s3tup_msg_buildasroot_error1="The cross ${txt_tc} build process was aborted because it must not run as root!" txt_s3tup_msg_buildasroot_error2="If you are aware of the danger of building ${txt_tc}s as root and you know what you are doing,\n you can force it with the following command:" txt_s3tup_msg_toolchain_exists="${txt_tc} already exists!" -txt_s3tup_msg_choose_ssl="Please select only one SSL version!" txt_s3tup_msg_library_not_found="${txt_lib} not found in config file!" txt_s3tup_msg_cross_toolchain_log="creating cross ${txt_tc} log" txt_s3tup_msg_cross_toolchain_commandlist="command list for cross ${txt_tc} creation" @@ -181,6 +180,7 @@ txt_s3tup_menu_library_title="${txt_lib} Update Menu" txt_s3tup_menu_library_text1="Select all libraries to update in ${txt_tc}'s SYSROOT folder:" txt_s3tup_menu_library_text2=" ${txt_lib} version NEW CURRENT" #56 chars txt_s3tup_menu_library_notfound="no libraries found" +txt_s3tup_menu_library_wrong_selection="Don't integrate the same library with different versions!" txt_s3tup_menu_template_title="Cross ${txt_tc} ${txt_tpl} Menu" txt_s3tup_menu_template_text1="Select one of the" diff --git a/support/translation/de b/support/translation/de index 99c5b13..07d735d 100644 --- a/support/translation/de +++ b/support/translation/de @@ -144,7 +144,6 @@ txt_s3tup_msg_reset_config5="Die Datei kann an die eigenen Bedürfnisse angepass txt_s3tup_msg_buildasroot_error1="Der Cross ${txt_tc} Erstellungsprozess wurde abgebrochen, da er nicht als Root ausgeführt werden darf!" txt_s3tup_msg_buildasroot_error2="Wenn Sie sich der Gefahren bewusst sind, die beim Erstellen von ${txt_tc}s als Root auftreten können\n und wissen was Sie tun, dann können Sie dies mit dem folgenden Befehl erzwingen:" txt_s3tup_msg_toolchain_exists="${txt_tc} bereits vorhanden!" -txt_s3tup_msg_choose_ssl="Bitte eine einzelne SSL-Version auswählen!" txt_s3tup_msg_library_not_found="${txt_lib} in der Konfigurationsdatei nicht gefunden!" txt_s3tup_msg_cross_toolchain_log="Erstellen des Cross ${txt_tc} Log" txt_s3tup_msg_cross_toolchain_commandlist="Befehlszeilen für die Cross ${txt_tc} Erstellung" @@ -197,6 +196,7 @@ txt_s3tup_menu_library_title="${txt_lib} Aktualisierung Menü" txt_s3tup_menu_library_text1="Wählen Sie alle zu aktualisierenden ${txt_lib}en im SYSROOT-Verzeichnis der ${txt_tc} aus:" txt_s3tup_menu_library_text2=" ${txt_lib} Version NEU AKTUELL" #56 chars txt_s3tup_menu_library_notfound="Keine ${txt_lib}en gefunden" +txt_s3tup_menu_library_wrong_selection="Integrieren Sie nicht dieselbe Bibliothek mit verschiedene Versionen!" txt_s3tup_menu_template_title="Cross ${txt_tc} ${txt_tpl}n Menü" txt_s3tup_menu_template_text1="Wählen Sie eine der" diff --git a/support/translation/en b/support/translation/en index cdad728..c3e60bd 100644 --- a/support/translation/en +++ b/support/translation/en @@ -135,7 +135,6 @@ txt_s3tup_msg_reset_config5="You can change/extend them to fit your needs." txt_s3tup_msg_buildasroot_error1="The cross ${txt_tc,,} build process was aborted because it must not run as root!" txt_s3tup_msg_buildasroot_error2="If you are aware of the danger of building ${txt_tc,,}s as root and you know what you are doing,\n you can force it with the following command:" txt_s3tup_msg_toolchain_exists="${txt_tc} already exists!" -txt_s3tup_msg_choose_ssl="Please select only one SSL version!" txt_s3tup_msg_library_not_found="${txt_lib} not found in config file!" txt_s3tup_msg_cross_toolchain_log="creating cross ${txt_tc,,} log" txt_s3tup_msg_cross_toolchain_commandlist="command list for cross ${txt_tc,,} creation" @@ -191,6 +190,7 @@ txt_s3tup_menu_library_title="${txt_lib} Update Menu" txt_s3tup_menu_library_text1="Select all libraries to update in ${txt_tc,,}'s SYSROOT folder:" txt_s3tup_menu_library_text2=" ${txt_lib,,} version NEW CURRENT" #56 chars txt_s3tup_menu_library_notfound="no libraries found" +txt_s3tup_menu_library_wrong_selection="Don't integrate the same library with different versions!" txt_s3tup_menu_template_title="Cross ${txt_tc} ${txt_tpl} Menu" txt_s3tup_menu_template_text1="Select one of the" diff --git a/support/translation/es b/support/translation/es index 2857085..daca04f 100644 --- a/support/translation/es +++ b/support/translation/es @@ -123,7 +123,6 @@ txt_s3tup_msg_reset_config5="You can change/extend them to fit your needs." txt_s3tup_msg_buildasroot_error1="The cross ${txt_tc} build process was aborted because it must not run as root!" txt_s3tup_msg_buildasroot_error2="If you are aware of the danger of building ${txt_tc}s as root and you know what you are doing,\n you can force it with the following command:" txt_s3tup_msg_toolchain_exists="${txt_tc} already exists!" -txt_s3tup_msg_choose_ssl="Please select only one SSL version!" txt_s3tup_msg_library_not_found="${txt_lib} not found in config file!" txt_s3tup_msg_cross_toolchain_log="creating cross ${txt_tc} log" txt_s3tup_msg_cross_toolchain_commandlist="command list for cross ${txt_tc} creation" @@ -176,6 +175,7 @@ txt_s3tup_menu_library_title="${txt_lib} Update Menu" txt_s3tup_menu_library_text1="Select all libraries to update in ${txt_tc}'s SYSROOT folder:" txt_s3tup_menu_library_text2=" ${txt_lib} version NEW CURRENT" #56 chars txt_s3tup_menu_library_notfound="no libraries found" +txt_s3tup_menu_library_wrong_selection="Don't integrate the same library with different versions!" txt_s3tup_menu_template_title="Cross ${txt_tc} ${txt_tpl} Menu" txt_s3tup_menu_template_text1="Select one of the" diff --git a/support/translation/fr b/support/translation/fr index e03d4fc..63ca77c 100644 --- a/support/translation/fr +++ b/support/translation/fr @@ -175,7 +175,6 @@ txt_s3tup_msg_reset_config5="You can change/extend them to fit your needs." txt_s3tup_msg_buildasroot_error1="The cross ${txt_tc} build process was aborted because it must not run as root!" txt_s3tup_msg_buildasroot_error2="If you are aware of the danger of building ${txt_tc}s as root and you know what you are doing,\n you can force it with the following command:" txt_s3tup_msg_toolchain_exists="${txt_tc} already exists!" -txt_s3tup_msg_choose_ssl="Please select only one SSL version!" txt_s3tup_msg_library_not_found="${txt_lib} not found in config file!" txt_s3tup_msg_cross_toolchain_log="creating cross ${txt_tc} log" txt_s3tup_msg_cross_toolchain_commandlist="command list for cross ${txt_tc} creation" @@ -228,6 +227,7 @@ txt_s3tup_menu_library_title="${txt_lib} Update Menu" txt_s3tup_menu_library_text1="Select all libraries to update in ${txt_tc}'s SYSROOT folder:" txt_s3tup_menu_library_text2=" ${txt_lib} version NEW CURRENT" #56 chars txt_s3tup_menu_library_notfound="no libraries found" +txt_s3tup_menu_library_wrong_selection="Don't integrate the same library with different versions!" txt_s3tup_menu_template_title="Cross ${txt_tc} ${txt_tpl} Menu" txt_s3tup_menu_template_text1="Select one of the" diff --git a/support/translation/it b/support/translation/it index a18022b..1d4c919 100644 --- a/support/translation/it +++ b/support/translation/it @@ -202,7 +202,6 @@ txt_s3tup_msg_reset_config5="You can change/extend them to fit your needs." txt_s3tup_msg_buildasroot_error1="The cross ${txt_tc} build process was aborted because it must not run as root!" txt_s3tup_msg_buildasroot_error2="If you are aware of the danger of building ${txt_tc}s as root and you know what you are doing,\n you can force it with the following command:" txt_s3tup_msg_toolchain_exists="${txt_tc} already exists!" -txt_s3tup_msg_choose_ssl="Please select only one SSL version!" txt_s3tup_msg_library_not_found="${txt_lib} not found in config file!" txt_s3tup_msg_cross_toolchain_log="creating cross ${txt_tc} log" txt_s3tup_msg_cross_toolchain_commandlist="command list for cross ${txt_tc} creation" @@ -255,6 +254,7 @@ txt_s3tup_menu_library_title="${txt_lib} Update Menu" txt_s3tup_menu_library_text1="Select all libraries to update in ${txt_tc}'s SYSROOT folder:" txt_s3tup_menu_library_text2=" ${txt_lib} version NEW CURRENT" #56 chars txt_s3tup_menu_library_notfound="no libraries found" +txt_s3tup_menu_library_wrong_selection="Don't integrate the same library with different versions!" txt_s3tup_menu_template_title="Cross ${txt_tc} ${txt_tpl} Menu" txt_s3tup_menu_template_text1="Select one of the" diff --git a/support/translation/nl b/support/translation/nl index 3e13e3b..f74c197 100644 --- a/support/translation/nl +++ b/support/translation/nl @@ -138,7 +138,6 @@ txt_s3tup_msg_reset_config5="You can change/extend them to fit your needs." txt_s3tup_msg_buildasroot_error1="The cross ${txt_tc} build process was aborted because it must not run as root!" txt_s3tup_msg_buildasroot_error2="If you are aware of the danger of building ${txt_tc}s as root and you know what you are doing,\n you can force it with the following command:" txt_s3tup_msg_toolchain_exists="${txt_tc} already exists!" -txt_s3tup_msg_choose_ssl="Please select only one SSL version!" txt_s3tup_msg_library_not_found="${txt_lib} not found in config file!" txt_s3tup_msg_cross_toolchain_log="creating cross ${txt_tc} log" txt_s3tup_msg_cross_toolchain_commandlist="command list for cross ${txt_tc} creation" @@ -191,6 +190,7 @@ txt_s3tup_menu_library_title="${txt_lib} Update Menu" txt_s3tup_menu_library_text1="Select all libraries to update in ${txt_tc}'s SYSROOT folder:" txt_s3tup_menu_library_text2=" ${txt_lib} version NEW CURRENT" #56 chars txt_s3tup_menu_library_notfound="no libraries found" +txt_s3tup_menu_library_wrong_selection="Don't integrate the same library with different versions!" txt_s3tup_menu_template_title="Cross ${txt_tc} ${txt_tpl} Menu" txt_s3tup_menu_template_text1="Select one of the" diff --git a/support/translation/pl b/support/translation/pl index 35da21f..8e3eb5b 100644 --- a/support/translation/pl +++ b/support/translation/pl @@ -138,7 +138,6 @@ txt_s3tup_msg_reset_config5="You can change/extend them to fit your needs." txt_s3tup_msg_buildasroot_error1="The cross ${txt_tc} build process was aborted because it must not run as root!" txt_s3tup_msg_buildasroot_error2="If you are aware of the danger of building ${txt_tc}s as root and you know what you are doing,\n you can force it with the following command:" txt_s3tup_msg_toolchain_exists="${txt_tc} already exists!" -txt_s3tup_msg_choose_ssl="Please select only one SSL version!" txt_s3tup_msg_library_not_found="${txt_lib} not found in config file!" txt_s3tup_msg_cross_toolchain_log="creating cross ${txt_tc} log" txt_s3tup_msg_cross_toolchain_commandlist="command list for cross ${txt_tc} creation" @@ -191,6 +190,7 @@ txt_s3tup_menu_library_title="${txt_lib} Update Menu" txt_s3tup_menu_library_text1="Select all libraries to update in ${txt_tc}'s SYSROOT folder:" txt_s3tup_menu_library_text2=" ${txt_lib} version NEW CURRENT" #56 chars txt_s3tup_menu_library_notfound="no libraries found" +txt_s3tup_menu_library_wrong_selection="Don't integrate the same library with different versions!" txt_s3tup_menu_template_title="Cross ${txt_tc} ${txt_tpl} Menu" txt_s3tup_menu_template_text1="Select one of the" diff --git a/support/translation/pt b/support/translation/pt index b8c7dbc..a467ebd 100644 --- a/support/translation/pt +++ b/support/translation/pt @@ -175,7 +175,6 @@ txt_s3tup_msg_reset_config5="You can change/extend them to fit your needs." txt_s3tup_msg_buildasroot_error1="The cross ${txt_tc} build process was aborted because it must not run as root!" txt_s3tup_msg_buildasroot_error2="If you are aware of the danger of building ${txt_tc}s as root and you know what you are doing,\n you can force it with the following command:" txt_s3tup_msg_toolchain_exists="${txt_tc} already exists!" -txt_s3tup_msg_choose_ssl="Please select only one SSL version!" txt_s3tup_msg_library_not_found="${txt_lib} not found in config file!" txt_s3tup_msg_cross_toolchain_log="creating cross ${txt_tc} log" txt_s3tup_msg_cross_toolchain_commandlist="command list for cross ${txt_tc} creation" @@ -228,6 +227,7 @@ txt_s3tup_menu_library_title="${txt_lib} Update Menu" txt_s3tup_menu_library_text1="Select all libraries to update in ${txt_tc}'s SYSROOT folder:" txt_s3tup_menu_library_text2=" ${txt_lib} version NEW CURRENT" #56 chars txt_s3tup_menu_library_notfound="no libraries found" +txt_s3tup_menu_library_wrong_selection="Don't integrate the same library with different versions!" txt_s3tup_menu_template_title="Cross ${txt_tc} ${txt_tpl} Menu" txt_s3tup_menu_template_text1="Select one of the" diff --git a/support/translation/tr b/support/translation/tr index 19a3396..6ada5dc 100644 --- a/support/translation/tr +++ b/support/translation/tr @@ -141,7 +141,6 @@ txt_s3tup_msg_reset_config5="bu doysayi size nasil gerekiyorsa uygulama yapabili txt_s3tup_msg_buildasroot_error1=" bu Cross $ {txt_tc} oluşturma prosesi işlemi iptal edildi, lütfen root olarak oturum açmayınız!" txt_s3tup_msg_buildasroot_error2="${txt_tc}s Root \ olarak oluşturmanın tehlikelerinin farkındaysanız ve ne yaptığınızı biliyorsanız, bunu aşağıdaki komutla uygulayabilirsiniz:" txt_s3tup_msg_toolchain_exists="${txt_tc} zaten var!" -txt_s3tup_msg_choose_ssl="lütfen tek bir tane SSL seçin!" txt_s3tup_msg_library_not_found="${txt_lib} yapılandırma dosyası bulunamadı" txt_s3tup_msg_cross_toolchain_log="Cross yaratmak ${txt_tc} Log" txt_s3tup_msg_cross_toolchain_commandlist="Cross kumanda dizme ${txt_tc} Oluşturma" @@ -194,6 +193,7 @@ txt_s3tup_menu_library_title="${txt_lib} Güncelleme menüsü" txt_s3tup_menu_library_text1="Güncellenecek icin hepsini seçiniz ${txt_lib}en SYSROOT kayıt defteri içinde ${txt_tc} bul:" txt_s3tup_menu_library_text2=" ${txt_lib} Version yeni MEVCUT" #56 chars txt_s3tup_menu_library_notfound="yok ${txt_lib}en bulundu" +txt_s3tup_menu_library_wrong_selection="Don't integrate the same library with different versions!" txt_s3tup_menu_template_title="Cross ${txt_tc} ${txt_tpl}n Menü" txt_s3tup_menu_template_text1="Şunlardan birini seçin"