mirror of
https://github.com/aclist/dztui.git
synced 2026-08-25 17:32:36 +02:00
commit
9678d41b4c
@ -1,5 +1,9 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [6.0.0-beta.17] 2026-01-14
|
||||||
|
## Added
|
||||||
|
- More descriptive help dialogs when initial dependencies are missing
|
||||||
|
|
||||||
## [6.0.0-beta.16] 2026-01-04
|
## [6.0.0-beta.16] 2026-01-04
|
||||||
## Fixed
|
## Fixed
|
||||||
- Regression introduced in previous hotfix
|
- Regression introduced in previous hotfix
|
||||||
|
|||||||
37
dzgui.sh
37
dzgui.sh
@ -3,7 +3,7 @@ set -o pipefail
|
|||||||
|
|
||||||
src_path=$(realpath "$0")
|
src_path=$(realpath "$0")
|
||||||
|
|
||||||
version=6.0.0.beta-16
|
version=6.0.0.beta-17
|
||||||
|
|
||||||
#CONSTANTS
|
#CONSTANTS
|
||||||
aid=221100
|
aid=221100
|
||||||
@ -141,7 +141,7 @@ test_gobject(){
|
|||||||
python3.13 -c "import gi"
|
python3.13 -c "import gi"
|
||||||
if [[ ! $? -eq 0 ]]; then
|
if [[ ! $? -eq 0 ]]; then
|
||||||
logger CRITICAL "Missing PyGObject"
|
logger CRITICAL "Missing PyGObject"
|
||||||
fdialog "Requires PyGObject (python-gobject)"
|
quit_with_pdialog "Requires PyGObject (python-gobject)"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
logger INFO "Found PyGObject in Python env"
|
logger INFO "Found PyGObject in Python env"
|
||||||
@ -226,7 +226,8 @@ depcheck(){
|
|||||||
for dep in "${!deps[@]}"; do
|
for dep in "${!deps[@]}"; do
|
||||||
if ! command -v "$dep" &> /dev/null; then
|
if ! command -v "$dep" &> /dev/null; then
|
||||||
local msg="Requires $dep >= ${deps[$dep]}"
|
local msg="Requires $dep >= ${deps[$dep]}"
|
||||||
raise_error_and_quit "$msg"
|
echo "$msg"
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
local jqmsg="jq must be compiled with support for oniguruma"
|
local jqmsg="jq must be compiled with support for oniguruma"
|
||||||
@ -235,10 +236,30 @@ depcheck(){
|
|||||||
[[ $? -ne 0 ]] && raise_error_and_quit "$jqmsg"
|
[[ $? -ne 0 ]] && raise_error_and_quit "$jqmsg"
|
||||||
logger INFO "Initial dependencies satisfied"
|
logger INFO "Initial dependencies satisfied"
|
||||||
}
|
}
|
||||||
|
open_url(){
|
||||||
|
url="$1"
|
||||||
|
if [[ -n "$BROWSER" ]]; then
|
||||||
|
logger INFO "Opening '$url' in '$BROWSER'"
|
||||||
|
"$BROWSER" "$url"
|
||||||
|
else
|
||||||
|
logger INFO "Opening '$url' with xdg-open"
|
||||||
|
xdg-open "$url"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
quit_with_pdialog(){
|
||||||
|
local sel
|
||||||
|
msg="$1"
|
||||||
|
help_button="Open help page"
|
||||||
|
url="https://aclist.github.io/dzgui/installation.html"
|
||||||
|
logger CRITICAL "$msg"
|
||||||
|
sel=$(zenity --info --extra-button="$help_button" --text="$msg")
|
||||||
|
[[ $sel == "$help_button" ]] && open_url "$url" &
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
check_pyver(){
|
check_pyver(){
|
||||||
if [[ ! $(command -v python3.13) ]]; then
|
if [[ ! $(python3.13 --version) ]]; then
|
||||||
local msg="Requires Python 3.13"
|
local msg="Requires Python 3.13"
|
||||||
raise_error_and_quit "$msg"
|
quit_with_pdialog "$msg"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
watcher_deps(){
|
watcher_deps(){
|
||||||
@ -603,7 +624,7 @@ fetch_helpers_by_sum(){
|
|||||||
[[ -f "$config_file" ]] && source "$config_file"
|
[[ -f "$config_file" ]] && source "$config_file"
|
||||||
declare -A sums
|
declare -A sums
|
||||||
sums=(
|
sums=(
|
||||||
["funcs"]="56c1701c005413e5d8329ecaecd457de"
|
["funcs"]="3c35e4d19b8c69971c564afb6ac22728"
|
||||||
["query_v2.py"]="55d339ba02512ac69de288eb3be41067"
|
["query_v2.py"]="55d339ba02512ac69de288eb3be41067"
|
||||||
["servers.py"]="ed442c3aecf33f777d59dcf53650d263"
|
["servers.py"]="ed442c3aecf33f777d59dcf53650d263"
|
||||||
["ui.py"]="8edf48e6780460bd8ea7b01614592296"
|
["ui.py"]="8edf48e6780460bd8ea7b01614592296"
|
||||||
@ -670,10 +691,6 @@ get_response_code(){
|
|||||||
local url="$1"
|
local url="$1"
|
||||||
curl -Ls -I -o /dev/null -w "%{http_code}" "$url"
|
curl -Ls -I -o /dev/null -w "%{http_code}" "$url"
|
||||||
}
|
}
|
||||||
raise_error_and_quit(){
|
|
||||||
echo "$1"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
fetch_ip_db(){
|
fetch_ip_db(){
|
||||||
parse_dl_url(){
|
parse_dl_url(){
|
||||||
curl -Ls "$url" \
|
curl -Ls "$url" \
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
version="6.0.0-beta.16"
|
version="6.0.0-beta.17"
|
||||||
|
|
||||||
#CONSTANTS
|
#CONSTANTS
|
||||||
aid=221100
|
aid=221100
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user