diff --git a/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm b/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm index 486fe011a..243cda40b 100755 --- a/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm +++ b/big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm @@ -60,7 +60,8 @@ declare -g Atualizar_text=$"Atualizar" declare -g Atualizado_text=$"Atualizado em" declare -g Atualizar_cache_text=$"Atualizar cache dos repositórios nativos" - declare -g Servidor_mais_rapido_text=$"Procurar servidor de repositórios nativos mais rápidos" + declare -g Atualizar_cache_pamac_text=$"Atualizar cache do Pamac" + declare -g Procurar_servidor_mais_rapido_text=$"Procurar servidor de repositórios nativos mais rápidos" declare -g Utilize_as_opcoes_a_seguir_com_Cautela_text=$"Utilize as opções a seguir com cautela" declare -g Reinstalar_text=$"Reinstalação" declare -g Reinstalar_forcado_text=$"Forçar reinstalação de todos os pacotes instalados" @@ -128,6 +129,7 @@ fi [[ "$update_pacman" = "y" ]] && sh_run_action "update_pacman" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" + [[ "$update_pamac" = "y" ]] && sh_run_action "update_pamac" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" [[ "$update_mirror" = "y" ]] && sh_run_action "update_mirror" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" [[ "$update_keys" = "y" ]] && sh_run_action "update_keys" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" [[ "$force_upgrade" = "y" ]] && sh_run_action "force_upgrade" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER" @@ -275,12 +277,17 @@ fi #TRADUCAO END - cat <<-EOF + cat <<-EOF + EOF + + #NATIVOS BEGIN + cat <<-EOF
$Repositorios_nativos_text
+
+ EOF + cat <<-EOF + + EOF + #NATIVOS END if TIni.Exist "$INI_FILE_BIG_STORE" "flatpak" "flatpak_active" '1' && [[ -e "/usr/lib/libpamac-flatpak.so" ]]; then cat <<-EOF @@ -418,6 +449,51 @@ EOF fi + if TIni.Exist "$INI_FILE_BIG_STORE" "snap" "snap_active" '1' && [[ -e "/usr/lib/libpamac-snap.so" ]]; then + cat <<-EOF + +
+
+ Repositório Snap +
+ +
+ + EOF + fi + cat <<-EOF
diff --git a/big-store/usr/share/bigbashview/bcc/apps/big-store/css/appstream.css b/big-store/usr/share/bigbashview/bcc/apps/big-store/css/appstream.css index 322ec6538..3ce787d0c 100644 --- a/big-store/usr/share/bigbashview/bcc/apps/big-store/css/appstream.css +++ b/big-store/usr/share/bigbashview/bcc/apps/big-store/css/appstream.css @@ -817,6 +817,22 @@ hr { transform: translateY(-50%);*/ } +.icon_background_about { + padding-top: 8px; + padding-bottom: 8px; + padding-left: 0px; + padding-right: 0px; + width: 420px; + height: 160px; + transition: 0.4s; + font-size: var(--text-size-big); + fill: var(--text-a-color); + margin: 0px; + border-radius: 15px; + box-shadow: 0px 0px 1px 1px var(--border-box); + border: 1px solid rgb(255 255 255 / 0%); +} + .icon_background { padding-top: 8px; padding-bottom: 8px; diff --git a/big-store/usr/share/bigbashview/bcc/apps/big-store/index.sh.htm b/big-store/usr/share/bigbashview/bcc/apps/big-store/index.sh.htm index ab508a93b..907f998b2 100755 --- a/big-store/usr/share/bigbashview/bcc/apps/big-store/index.sh.htm +++ b/big-store/usr/share/bigbashview/bcc/apps/big-store/index.sh.htm @@ -6,7 +6,7 @@ # Description: Big Store installing programs for BigLinux # # Created: 2020/01/11 -# Altered: 2024/01/08 +# Altered: 2024/01/09 # # Copyright (c) 2023-2024, Vilmar Catafesta # 2022-2024, Bruno Gonçalves @@ -34,8 +34,8 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. APP="${0##*/}" -_VERSION_="1.0.0-20240108" -_UPDATED_="08/01/2024" +_VERSION_="1.0.0-20240109" +_UPDATED_="09/01/2024" export BOOTLOG="/tmp/bigstore-$USER-$(date +"%d%m%Y").log" export LOGGER='/dev/tty8' export TMP_FOLDER="/tmp/bigstore-$USER" @@ -45,7 +45,7 @@ [[ -f "${LIBRARY}/bstrlib.sh" ]] && source "${LIBRARY}/bstrlib.sh" function sh_config { - declare -g LOCAL_VERSION="1.0.0-20240108" + declare -g LOCAL_VERSION="1.0.0-20240109" #Translation export TEXTDOMAINDIR="/usr/share/locale" export TEXTDOMAIN=big-store @@ -316,22 +316,32 @@ } export -f ICON_CATEGORY +function list_about() { + local array=("$@") + + echo '
    ' + for item in "${array[@]}"; do + echo '
  • ' + echo $item + echo '
  • ' + done + echo '
' +} + function ICON_ABOUT() { - local category="$1" - local classe="$2" - local cname="$3" + local array=("$@") cat <<-EOF -
+
- +
- $cname + $(list_about "${array[@]}")
EOF } @@ -621,8 +631,16 @@

EOF - ICON_ABOUT deveditor "fas fa-file-code" "Aplicativo : $TEXTDOMAIN" - ICON_ABOUT deveditor "fas fa-file-code" "Versão : $LOCAL_VERSION - $_UPDATED_" + my_array=("Aplicativo : $TEXTDOMAIN" + "Versão : $LOCAL_VERSION" + "Atualizado em : $_UPDATED_") + ICON_ABOUT "${my_array[@]}" + my_array=('Desenvolvedores:' + '' + 'Bruno Gonçalves, [www.biglinux.com.br]' + 'Vilmar Catafesta, [vcatafesta@gmail.com]' + 'Rafael Ruscher, [rruscher@gmail.com]') + ICON_ABOUT "${my_array[@]}" #sex 05 jan 2024 12:19:03 -04 cat <<-EOF