Skip to content

Commit

Permalink
Merge pull request #87 from vcatafesta/main
Browse files Browse the repository at this point in the history 
qua 10 jan 2024 15:04:27 -04 Vilmar Catafesta ([email protected])
  • Loading branch information
@bigbruno
bigbruno authored Jan 10, 2024
2 parents 96722d6 + 3494c5a commit 42a4a91
Show file tree
Hide file tree
Showing 3 changed files with 126 additions and 16 deletions.
84 changes: 80 additions & 4 deletions big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -275,12 +277,17 @@
fi
#TRADUCAO END

cat <<-EOF
cat <<-EOF
</li></ul></div>
EOF

#NATIVOS BEGIN
cat <<-EOF
<div class="content-section">
<div class="content-section-title">
$Repositorios_nativos_text
</div>
<ul>
<li class="hidemenu">
<div class="products">
Expand All @@ -305,6 +312,7 @@
$Atualizar_text
EOF
fi

cat <<-EOF
</span>
<div class="button-wrapper">
Expand All @@ -313,20 +321,43 @@
</button>
</div>
</li>
EOF

# ter 09 jan 2024 00:25:25 -04
cat <<-EOF
<li class="any-product">
<div class="products">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512" style="border-radius: 0px;" >
<path fill="currentColor" d="M160 48C160 21.49 181.5 0 208 0H256V80C256 88.84 263.2 96 272 96H304C312.8 96 320 88.84 320 80V0H368C394.5 0 416 21.49 416 48V176C416 202.5 394.5 224 368 224H208C181.5 224 160 202.5 160 176V48zM96 288V368C96 376.8 103.2 384 112 384H144C152.8 384 160 376.8 160 368V288H208C234.5 288 256 309.5 256 336V464C256 490.5 234.5 512 208 512H48C21.49 512 0 490.5 0 464V336C0 309.5 21.49 288 48 288H96zM416 288V368C416 376.8 423.2 384 432 384H464C472.8 384 480 376.8 480 368V288H528C554.5 288 576 309.5 576 336V464C576 490.5 554.5 512 528 512H368C341.5 512 320 490.5 320 464V336C320 309.5 341.5 288 368 288H416z">
</path></svg>
$Atualizar_cache_pamac_text
</div>
<div class="button-wrapper">
<button class="content-button status-button" onclick="disableBodyConfig(); location.href='config.sh.htm?update_pamac=y';">
$Executar_text
</button>
</div></li>
EOF
# ter 09 jan 2024 00:25:25 -04

cat <<-EOF
<li class="any-product">
<div class="products">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512" style="border-radius: 0px;" >
<path fill="currentColor" d="M112 0C85.49 0 64 21.49 64 48V96H16C7.163 96 0 103.2 0 112C0 120.8 7.163 128 16 128H272C280.8 128 288 135.2 288 144C288 152.8 280.8 160 272 160H48C39.16 160 32 167.2 32 176C32 184.8 39.16 192 48 192H240C248.8 192 256 199.2 256 208C256 216.8 248.8 224 240 224H16C7.163 224 0 231.2 0 240C0 248.8 7.163 256 16 256H208C216.8 256 224 263.2 224 272C224 280.8 216.8 288 208 288H64V416C64 469 106.1 512 160 512C213 512 256 469 256 416H384C384 469 426.1 512 480 512C533 512 576 469 576 416H608C625.7 416 640 401.7 640 384C640 366.3 625.7 352 608 352V237.3C608 220.3 601.3 204 589.3 192L512 114.7C499.1 102.7 483.7 96 466.7 96H416V48C416 21.49 394.5 0 368 0H112zM544 237.3V256H416V160H466.7L544 237.3zM160 464C133.5 464 112 442.5 112 416C112 389.5 133.5 368 160 368C186.5 368 208 389.5 208 416C208 442.5 186.5 464 160 464zM528 416C528 442.5 506.5 464 480 464C453.5 464 432 442.5 432 416C432 389.5 453.5 368 480 368C506.5 368 528 389.5 528 416z">
</path></svg>
$Servidor_mais_rapido_text
$Procurar_servidor_mais_rapido_text
</div>
<div class="button-wrapper">
<button class="content-button status-button" onclick="disableBodyConfig(); location.href='config.sh.htm?update_mirror=y';">
$Executar_text
</button>
</div></li></ul></div>
</div></li>
EOF
cat <<-EOF
</ul></div>
EOF
#NATIVOS END

if TIni.Exist "$INI_FILE_BIG_STORE" "flatpak" "flatpak_active" '1' && [[ -e "/usr/lib/libpamac-flatpak.so" ]]; then
cat <<-EOF
Expand Down Expand Up @@ -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
<!-- BEGIN snap repair -->
<div class="content-section">
<div class="content-section-title">
Repositório Snap
</div>
<ul>
<li class="hidemenu">
<div class="products">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512" style="border-radius: 0px;">
<path fill="currentColor" d="M160 48C160 21.49 181.5 0 208 0H256V80C256 88.84 263.2 96 272 96H304C312.8 96 320 88.84 320 80V0H368C394.5 0 416 21.49 416 48V176C416 202.5 394.5 224 368 224H208C181.5 224 160 202.5 160 176V48zM96 288V368C96 376.8 103.2 384 112 384H144C152.8 384 160 376.8 160 368V288H208C234.5 288 256 309.5 256 336V464C256 490.5 234.5 512 208 512H48C21.49 512 0 490.5 0 464V336C0 309.5 21.49 288 48 288H96zM416 288V368C416 376.8 423.2 384 432 384H464C472.8 384 480 376.8 480 368V288H528C554.5 288 576 309.5 576 336V464C576 490.5 554.5 512 528 512H368C341.5 512 320 490.5 320 464V336C320 309.5 341.5 288 368 288H416z">
</path></svg>
Reconstruir base de dados Snap
</div>
<span class="status">
EOF
if TIni.Exist "$INI_FILE_BIG_STORE" "snap" "snap_atualizado" '1'; then
local snap_data_atualizacao=$(TIni.Get "$INI_FILE_BIG_STORE" "snap" "snap_data_atualizacao")
cat <<-EOF
<span class="status-circle true"></span>
<!-- <span class="status-circle green"></span> -->
$Atualizado_text $snap_data_atualizacao
EOF
else
cat <<-EOF
<span class="status-circle false"></span>
<!-- <span class="status-circle green"></span> -->
$Atualizar_text
EOF
fi
cat <<-EOF
</span>
<div class="button-wrapper">
<button class="content-button status-button" onclick="disableBodyConfig(); location.href='config.sh.htm?update_snap=y';">
$Executar_text
</button>
</div>
</li>
</ul>
</div>
<!-- END snap repair -->
EOF
fi

cat <<-EOF
<div class="content-section">
<div class="content-section-title">
Expand Down
16 changes: 16 additions & 0 deletions big-store/usr/share/bigbashview/bcc/apps/big-store/css/appstream.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
42 changes: 30 additions & 12 deletions big-store/usr/share/bigbashview/bcc/apps/big-store/index.sh.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
# 2022-2024, Bruno Gonçalves <www.biglinux.com.br>
Expand Down Expand Up @@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -316,22 +316,32 @@
}
export -f ICON_CATEGORY

function list_about() {
local array=("$@")

echo '<ul>'
for item in "${array[@]}"; do
echo '<li>'
echo $item
echo '</li>'
done
echo '</ul>'
}

function ICON_ABOUT() {
local category="$1"
local classe="$2"
local cname="$3"
local array=("$@")

cat <<-EOF
<div class="icon_background">
<div class="icon_background_about">
<div class="vertical_align_center">
<div class="icon">
<span class="category_font_icon">
<i class="$classe"></i>
<i class="fas"></i>
</span>
</div>
<div class="icon_text">
<div class="icon_text_vertical_align">
$cname
$(list_about "${array[@]}")
</div></div></div></div></a>
EOF
}
Expand Down Expand Up @@ -621,8 +631,16 @@ <h3 class="img-content">
<div class="category_index_list">
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, [[email protected]]'
'Rafael Ruscher, [[email protected]]')
ICON_ABOUT "${my_array[@]}"
#sex 05 jan 2024 12:19:03 -04

cat <<-EOF
Expand Down

0 comments on commit 42a4a91

Please sign in to comment.