From 155b1850e38e69558b190765ef4b0ffe4adfa97b Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Wed, 31 Jan 2024 18:01:10 +0900 Subject: [PATCH] fix: set branch on update --- dzgui.sh | 14 +++++++------- helpers/funcs | 2 +- helpers/ui.py | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dzgui.sh b/dzgui.sh index f6697a2..9eed3ed 100755 --- a/dzgui.sh +++ b/dzgui.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -o pipefail -version=5.0.0.rc-44 +version=5.0.0.rc-45 #CONSTANTS aid=221100 @@ -548,25 +548,25 @@ fetch_dzq(){ fetch_helpers_by_sum(){ declare -A sums sums=( - ["ui.py"]="9411e901a8572568ab129a4fe472a0a3" + ["ui.py"]="6c6e024633f37915d010bc745fecdf7e" ["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197" ["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397" - ["funcs"]="722834d7fa7aa60a2cf7f5b7350c5675" + ["funcs"]="609cfc212219f43af70cd86e7cf87c8f" ) local author="aclist" local repo="dztui" - local branch="$branch" - #TODO: update to 'dzgui' for first time setup - [[ -z $branch ]] && branch="testing" + local realbranch local file local sum local full_path + [[ -z $branch ]] && realbranch="dzgui" + [[ $branch == "testing" ]] && realbranch="$branch" for i in "${!sums[@]}"; do file="$i" sum="${sums[$i]}" full_path="$helpers_path/$file" - url="https://raw.githubusercontent.com/$author/$repo/$branch/helpers/$file" + url="https://raw.githubusercontent.com/$author/$repo/$realbranch/helpers/$file" echo "$url" >> $HOME/log if [[ -f "$full_path" ]] && [[ $(get_hash "$full_path") == $sum ]]; then logger INFO "$file is current" diff --git a/helpers/funcs b/helpers/funcs index cc58af6..9e3c2fe 100755 --- a/helpers/funcs +++ b/helpers/funcs @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o pipefail -version=5.0.0.rc-44 +version=5.0.0.rc-45 #CONSTANTS aid=221100 diff --git a/helpers/ui.py b/helpers/ui.py index 56f7104..3a95431 100644 --- a/helpers/ui.py +++ b/helpers/ui.py @@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '') gi.require_version("Gtk", "3.0") from gi.repository import Gtk, GLib, Gdk, GObject, Pango -# 5.0.0-rc.44 +# 5.0.0-rc.45 app_name = "DZGUI" cache = {}