From 6e35ea5206d368317772ecb6a2a29dd9dceb3e07 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Sat, 5 Jun 2021 18:50:11 +0700 Subject: [PATCH] Revamp debugging --- lib-core.sh | 5 ++++- lib-install.sh | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib-core.sh b/lib-core.sh index 650dc10..8f864f1 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -194,6 +194,9 @@ prompt() { ############################################################################### ##### This is the core of error handling, make sure there's no error here ##### +### TODO: return "lockWhiteSur()" back for non functional syntax error handling +### and lock dir removal after immediate terminal window closing + if [[ -d "${WHITESUR_TMP_DIR}" ]]; then start_animation; sleep 2; stop_animation; echo @@ -218,7 +221,7 @@ operation_aborted() { local repo_ver="" local lines=() - if ! repo_ver="$(cd "${REPO_DIR}"; git log -1 --date=format-local:"%FT%T%z" --format="%ad")"; then + if ! repo_ver="$(cd "${REPO_DIR}"; git log -1 --date=format-local:"%FT%T%z" --format="%ad" 2> /dev/null)"; then if ! repo_ver="$(date -r "${REPO_DIR}" +"%FT%T%z")"; then repo_ver="unknown" fi diff --git a/lib-install.sh b/lib-install.sh index 265abfa..087cbee 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -22,6 +22,9 @@ install_theme_deps() { ! has_command xmllint || [[ ! -r "/usr/share/gtk-engines/murrine.xml" ]]; then echo; prompt -w "'glib2.0', 'sassc', 'xmllint', and 'libmurrine' are required for theme installation." + # Be careful of some distro mechanism, some of them use rolling-release + # based installation, e.g., Arch Linux + if has_command zypper; then rootify zypper in -y sassc glib2-devel gtk2-engine-murrine libxml2-tools elif has_command apt; then