Skip to content

Commit

Permalink
Merge pull request #59 from vcatafesta/main
Browse files Browse the repository at this point in the history
 qui 24 ago 2023 00:47:22 -04 Vilmar Catafesta ([email protected])
  • Loading branch information
bigbruno authored Aug 24, 2023
2 parents 02f2bb6 + 2c29a5c commit 3ad8fb3
Show file tree
Hide file tree
Showing 15 changed files with 443 additions and 256 deletions.
18 changes: 9 additions & 9 deletions big-store/usr/share/bigbashview/bcc/apps/big-store/config.sh.htm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Description: Big Store installing programs for BigLinux
#
# Created: 2022/11/01
# Altered: 2023/08/16
# Altered: 2023/08/24
#
# Copyright (c) 2023-2023, Vilmar Catafesta <[email protected]>
# 2022-2023, Bruno Gonçalves <www.biglinux.com.br>
Expand Down Expand Up @@ -34,7 +34,7 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

APP="${0##*/}"
_VERSION_="1.0.0-20230816"
_VERSION_="1.0.0-20230824"
LIBRARY=${LIBRARY:-'/usr/share/bigbashview/bcc/shell'}
BOOTLOG="/tmp/bigstore-$USER-$(date +"%d%m%Y").log"
LOGGER='/dev/tty8'
Expand Down Expand Up @@ -96,13 +96,13 @@
pacman -Qu | cut -f1 -d" " >>"$tmp_file_upgradeable"
fi

[[ "$update_pacman" = "y" ]] && sh_run_action "update_pacman"
[[ "$update_mirror" = "y" ]] && sh_run_action "update_mirror"
[[ "$update_keys" = "y" ]] && sh_run_action "update_keys"
[[ "$force_upgrade" = "y" ]] && sh_run_action "force_upgrade"
[[ "$reinstall_allpkg" = "y" ]] && sh_run_action "reinstall_allpkg"
[[ "$system_upgrade" = "y" ]] && sh_run_action "system_upgrade"
[[ "$system_upgradetotal" = "y" ]] && sh_run_action "system_upgradetotal"
[[ "$update_pacman" = "y" ]] && sh_run_action "update_pacman" "$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"
[[ "$reinstall_allpkg" = "y" ]] && sh_run_action "reinstall_allpkg" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER"
[[ "$system_upgrade" = "y" ]] && sh_run_action "system_upgrade" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER"
[[ "$system_upgradetotal" = "y" ]] && sh_run_action "system_upgradetotal" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER"

cat <<-EOF
<div id=box_index_category>
Expand Down
10 changes: 5 additions & 5 deletions big-store/usr/share/bigbashview/bcc/apps/big-store/header.sh.htm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Description: Control Center to help usage of BigLinux
#
# Created: 2020/11/01
# Altered: 2023/08/18
# Altered: 2023/08/24
#
# Copyright (c) 2023-2023, Vilmar Catafesta <[email protected]>
# 2022-2023, Bruno Gonçalves <www.biglinux.com.br>
Expand Down Expand Up @@ -34,7 +34,7 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

APP="${0##*/}"
_VERSION_="1.0.0-20230818"
_VERSION_="1.0.0-20230824"
export BOOTLOG="/tmp/bigstore-$USER-$(date +"%d%m%Y").log"
export LOGGER='/dev/tty8'
export HOME_FOLDER="$HOME/.bigstore"
Expand Down Expand Up @@ -83,7 +83,7 @@
e oculta resultados que são úteis <br>
apenas a usuários avançados."

declare -g TYPE_SEARCH=$"Procurar programa"
declare -g TYPE_SEARCH=$"Procurar aplicativo"
declare -g MODE_SIMPLE=$"Modo Simplificado"
declare -g Nativos_text=$"Nativos"
declare -g ProgressMessage=$"Aplicando - Aguarde"
Expand Down Expand Up @@ -577,9 +577,9 @@
<span class="lever">
</span>
Aur
<div id=aur_icon_loading>
<div id="aur_icon_loading">
</div>
<div id=aur_number>
<div id="aur_number">
</div></label></div></div>
EOF

Expand Down
12 changes: 7 additions & 5 deletions big-store/usr/share/bigbashview/bcc/apps/big-store/index.sh.htm
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: 2023/08/18
# Altered: 2023/08/24
#
# Copyright (c) 2023-2023, Vilmar Catafesta <[email protected]>
# 2022-2023, Bruno Gonçalves <www.biglinux.com.br>
Expand Down Expand Up @@ -34,7 +34,7 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

APP="${0##*/}"
_VERSION_="1.0.0-20230818"
_VERSION_="1.0.0-20230824"
export BOOTLOG="/tmp/bigstore-$USER-$(date +"%d%m%Y").log"
export LOGGER='/dev/tty8'
export TMP_FOLDER="/tmp/bigstore-$USER"
Expand Down Expand Up @@ -124,6 +124,7 @@
fi
cat <<-EOF
<script>fileReplaceDiv(true, '#content_aur', '${TMP_FOLDER}/aur.html');</script>
<script>fileReplaceDiv(true, '#aur_number', '${TMP_FOLDER}/aur_number.html');</script>
</div>
</div>
EOF
Expand All @@ -143,17 +144,18 @@
</div>
<div style="margin-right: 5px;">
$Programas_Nativos
</div>
</div>
</div>
</div></div></div>
<div id="content_appstream">
<script>document.getElementById("aur_icon_loading").innerHTML = "<div class=progress><div class=indeterminate></div></div>";</script>
EOF

pacman -Qu | cut -f1 -d" " >"${TMP_FOLDER}/upgradeable.txt"
./category_appstream_pamac.py "$@"

cat <<-EOF
<script>runAvatarAppstream();</script>
<script>fileReplaceDiv(true, '#content_appstream', '${TMP_FOLDER}/aur.html');</script>
<script>fileReplaceDiv(true, '#appstream_number', '${TMP_FOLDER}/aur_number.html');</script>
</div>
</div>
EOF
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Description: Control Center to help usage of BigLinux
#
# Created: 2022/02/28
# Altered: 2023/08/18
# Altered: 2023/08/24
#
# Copyright (c) 2023-2023, Vilmar Catafesta <[email protected]>
# 2022-2023, Bruno Gonçalves <www.biglinux.com.br>
Expand Down Expand Up @@ -34,7 +34,7 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

APP="${0##*/}"
_VERSION_="1.0.0-20230818"
_VERSION_="1.0.0-20230824"
export BOOTLOG="/tmp/bigcontrolcenter-$USER-$(date +"%d%m%Y").log"
export LOGGER='/dev/tty8'
export TMP_FOLDER="/tmp/bigstore-$USER"
Expand Down Expand Up @@ -68,7 +68,7 @@
if [ "$pkg_remove" = "y" ]; then
ACTION="remove_snap"
PACKAGE_NAME="$pkg_name"
sh_run_action "$ACTION"
sh_run_action "$ACTION" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER"
fi

for i in $(snap list | cut -f1 -d" " | tail -n +2); do
Expand Down
14 changes: 7 additions & 7 deletions big-store/usr/share/bigbashview/bcc/apps/big-store/load.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Description: Control Center to help usage of BigLinux
#
# Created: 2022/02/28
# Altered: 2023/08/18
# Altered: 2023/08/24
#
# Copyright (c) 2023-2023, Vilmar Catafesta <[email protected]>
# 2022-2023, Bruno Gonçalves <www.biglinux.com.br>
Expand Down Expand Up @@ -34,7 +34,7 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

APP="${0##*/}"
_VERSION_="1.0.0-20230818"
_VERSION_="1.0.0-20230824"
export BOOTLOG="/tmp/bigcontrolcenter-$USER-$(date +"%d%m%Y").log"
export LOGGER='/dev/tty8'
export HOME_FOLDER="$HOME/.bigstore"
Expand All @@ -60,22 +60,22 @@ function sh_load_main {
local pacote="$2"
local paths

xdebug "sh_load_main:$LINENO"

sh_load_config
sh_load_refresh_db
if [[ -n "$pacote" ]]; then
case $1 in
pkg_not_installed)
if paths=$(pacman -Flq "$pacote") && [[ -n "$paths" ]]; then
sed 's|^|/|' <<<"$paths"
fi
;;
pacman -Flq "$2" | sed 's|^|/|'
;;
pkg_installed)
pacman -Qk "$pacote"
pacman -Qlq "$pacote"
;;
pkg_installed_flatpak)
echo "Folder base: $(flatpak info --show-location "$pacote")"
find $(flatpak info --show-location "$pacote") | sed "s|$(flatpak info --show-location "$pacote")||g"
find "$(flatpak info --show-location "$pacote")" | sed "s|$(flatpak info --show-location "$pacote")||g"
;;
esac
else
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Description: Control Center to help usage of BigLinux
#
# Created: 2022/02/28
# Altered: 2023/08/18
# Altered: 2023/08/24
#
# Copyright (c) 2023-2023, Vilmar Catafesta <[email protected]>
# 2022-2023, Bruno Gonçalves <www.biglinux.com.br>
Expand Down Expand Up @@ -34,7 +34,7 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

APP="${0##*/}"
_VERSION_="1.0.0-20230818"
_VERSION_="1.0.0-20230824"
export BOOTLOG="/tmp/bigcontrolcenter-$USER-$(date +"%d%m%Y").log"
export LOGGER='/dev/tty8'
export HOME_FOLDER="$HOME/.bigstore"
Expand Down Expand Up @@ -62,7 +62,9 @@
ACTION="reinstall_pamac"
REPOSITORY="$REPOSITORY"
PACKAGE_NAME="${pkg_name,,}"
sh_run_action "$ACTION"
PACKAGE_ID=""
WINDOW_ID=""
sh_run_action "$ACTION" "$WINDOW_ID" "$PACKAGE_NAME" "$PACKAGE_ID" "$REPOSITORY" "$DRIVER"
pacman -Qu | cut -f1 -d" " >>${TMP_FOLDER}/upgradeable.txt
fi

Expand Down
Loading

0 comments on commit 3ad8fb3

Please sign in to comment.