From f2f4240a3e17507ee80a3bbbadfc6d972159dae5 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Sun, 13 Jun 2021 09:37:09 +0700 Subject: [PATCH] Deprecate murrine --- lib-core.sh | 15 +++++++++++++++ lib-install.sh | 2 +- src/main/gtk-2.0/common/main.rc | 1 - src/main/gtk-2.0/menubar-toolbar-dark.rc | 3 --- src/main/gtk-2.0/menubar-toolbar-light.rc | 2 -- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index 51770e0b..884084a2 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -666,6 +666,21 @@ full_sudo() { fi } +get_http_response() { + exec 3<> "/dev/tcp/${1}/80" + echo -e "GET / HTTP/1.1\nHost: ${1}\n\n" >&3 + + ( + IFS="" + + while read -r -t 1 line 0<&3; do + echo "${line//$"\r"}" + done + ) + + exec 3<&- +} + usage() { prompt -e "Usage function is not implemented"; exit 1 } diff --git a/lib-install.sh b/lib-install.sh index 858b7627..cc0bbe67 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -61,7 +61,7 @@ prepare_deps() { prompt -i "DEPS: Checking your internet connection..." - if ! head="$(curl -Is -o - 'time.cloudflare.com' || wget -Sq -o - --max-redirect=0 'time.cloudflare.com')"; then + if ! head="$(get_http_response 'time.cloudflare.com')"; then prompt -e "DEPS ERROR: You have an internet connection issue\n"; exit 1 fi diff --git a/src/main/gtk-2.0/common/main.rc b/src/main/gtk-2.0/common/main.rc index d21517bc..d0a410d6 100644 --- a/src/main/gtk-2.0/common/main.rc +++ b/src/main/gtk-2.0/common/main.rc @@ -2459,7 +2459,6 @@ widget "xfwm4-tabwin*GtkButton*" style "xfwm- # Fixes ugly text shadows for insensitive text widget_class "*" style "text" -widget_class "**" style "menu_text" widget_class "**" style "text" widget_class "**" style "text" widget_class "**" style "text" diff --git a/src/main/gtk-2.0/menubar-toolbar-dark.rc b/src/main/gtk-2.0/menubar-toolbar-dark.rc index c27c9c3a..55d05ffb 100644 --- a/src/main/gtk-2.0/menubar-toolbar-dark.rc +++ b/src/main/gtk-2.0/menubar-toolbar-dark.rc @@ -201,14 +201,11 @@ widget_class "*ThunarWindow*" style "menub class "ChromeGtkFrame" style "chrome-gtk-frame" -widget_class "***" style "menubar-text" - # Whitelist for dark toolbars widget_class "*ThunarWindow*" style "menubar-borderless" widget_class "*ThunarWindow**" style "toolbar_entry" widget_class "*ThunarWindow**" style "toolbar_button" widget_class "*ThunarWindow**" style "toolbar_text" -widget_class "*ThunarWindow***" style "menubar-text" # GtkCheckButton widget_class "*" style "button" diff --git a/src/main/gtk-2.0/menubar-toolbar-light.rc b/src/main/gtk-2.0/menubar-toolbar-light.rc index bacb5f93..9a22d7ef 100644 --- a/src/main/gtk-2.0/menubar-toolbar-light.rc +++ b/src/main/gtk-2.0/menubar-toolbar-light.rc @@ -144,8 +144,6 @@ widget_class "*CajaNavigationWindow*" style "menub class "ChromeGtkFrame" style "chrome-gtk-frame" -widget_class "***" style "menubar-text" - # Whitelist for dark toolbars widget_class "*ThunarWindow*" style "menubar" widget_class "*CajaNavigationWindow*" style "menubar"