luisgulo/WhiteSur-gtk-theme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #191 from rivanfebrian123/master

Browse Source 
fixed gsettings problem and made a better error logging
This commit is contained in:
Vince 2021-04-16 22:37:16 +08:00 committed by GitHub
commit aebc1ce92c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib-core.sh
View File

@ -112,6 +112,7 @@ max_round="false"
# Misc # Misc
msg="Run '${0} --help' to explore more customization features!" msg="Run '${0} --help' to explore more customization features!"
error_msg=""
process_ids=() process_ids=()
ANIM_PID="0" ANIM_PID="0"
has_any_error="false" has_any_error="false"
@ -459,7 +460,7 @@ lockWhiteSur() {
rootify() { rootify() {
trap true SIGINT trap true SIGINT
prompt -w "Executing '$(echo "${@}" | cut -c -35 )...' as root" prompt -w "Executing '$(echo "${@}" | cut -c -35 )...' as root"
sudo ${@} || operation_canceled error_msg="$(sudo ${@} 2>&1)" || operation_canceled
trap sig_c SIGINT trap sig_c SIGINT
} }
@ -472,7 +473,7 @@ full_rootify() {
userify() { userify() {
trap true SIGINT trap true SIGINT
sudo -u "${MY_USERNAME}" ${@} || operation_canceled error_msg="$(sudo -u "${MY_USERNAME}" ${@} 2>&1)" || operation_canceled
trap sig_c SIGINT trap sig_c SIGINT
} }
@ -482,7 +483,17 @@ sig_c() {
} }
operation_canceled() { operation_canceled() {
clear; prompt -e "\n\n Oops! Operation has been canceled or failed...\n\n"; exit 1 clear
if [[ ${error_msg} != "" ]]; then
prompt -e "\n\n Oops! An error is detected...\n"
prompt -e "ERROR LOG:\n${error_msg}\n"
prompt -i "TIP: you can google or report to us the error log above\n\n"
else
prompt -e "\n\n Oops! Operation has been canceled or failed...\n\n"
fi
exit 1
} }
usage() { usage() {

2
lib-install.sh
View File

@ -440,7 +440,7 @@ install_dash_to_dock_theme() {
rootify sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet$(destify ${colors[0]}).scss" "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css" rootify sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet$(destify ${colors[0]}).scss" "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css"
fi fi
userify dbus-launch gsettings set org.gnome.shell.extensions.dash-to-dock apply-custom-theme true userify dbus-launch dconf write /org/gnome/shell/extensions/dash-to-dock/apply-custom-theme true
} }
revert_dash_to_dock_theme() { revert_dash_to_dock_theme() {