From 24ed623d4776417d94637d69cd45b2be9a04b400 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Mon, 19 Apr 2021 18:35:20 +0700 Subject: [PATCH] critical update --- lib-core.sh | 8 ++++++-- lib-install.sh | 39 ++++++++++++++++++++++++--------------- tweaks.sh | 2 +- 3 files changed, 31 insertions(+), 18 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index d20a4d84..72b9b96e 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -460,7 +460,7 @@ lockWhiteSur() { rootify() { trap true SIGINT prompt -w "Executing '$(echo "${@}" | cut -c -35 )...' as root" - error_msg="$(sudo ${@} 2>&1)" || operation_canceled + sudo ${@} 2> "${WHITESUR_TMP_DIR}/error_log.txt" || operation_canceled trap sig_c SIGINT } @@ -473,7 +473,7 @@ full_rootify() { userify() { trap true SIGINT - error_msg="$(sudo -u "${MY_USERNAME}" ${@} 2>&1)" || operation_canceled + sudo -u "${MY_USERNAME}" ${@} 2> "${WHITESUR_TMP_DIR}/error_log.txt" || operation_canceled trap sig_c SIGINT } @@ -485,6 +485,10 @@ sig_c() { operation_canceled() { clear + if [[ -f "${WHITESUR_TMP_DIR}/error_log.txt" ]]; then + error_msg="$(cat "${WHITESUR_TMP_DIR}/error_log.txt")" + fi + if [[ ${error_msg} != "" ]]; then prompt -e "\n\n Oops! An error is detected...\n" prompt -e "ERROR LOG:\n${error_msg}\n" diff --git a/lib-install.sh b/lib-install.sh index 57beb7ba..ff0337f6 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -114,6 +114,26 @@ install_darky() { sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk-dark${opacity}${theme}.scss" "${WHITESUR_TMP_DIR}/darky-4${opacity}${theme}.css" } +install_xfwmy() { + local color="$(destify ${1})" + + local TARGET_DIR="${dest}/${name}${color}-mdpi" + local HDPI_TARGET_DIR="${dest}/${name}${color}-hdpi" + local XHDPI_TARGET_DIR="${dest}/${name}${color}-xhdpi" + + mkdir -p "${TARGET_DIR}/xfwm4" + cp -r "${THEME_SRC_DIR}/assets/xfwm4/assets${color}/"*".png" "${TARGET_DIR}/xfwm4" + cp -r "${THEME_SRC_DIR}/main/xfwm4/themerc${color}" "${TARGET_DIR}/xfwm4/themerc" + + mkdir -p "${HDPI_TARGET_DIR}/xfwm4" + cp -r "${THEME_SRC_DIR}/assets/xfwm4/assets${color}-hdpi/"*".png" "${HDPI_TARGET_DIR}/xfwm4" + cp -r "${THEME_SRC_DIR}/main/xfwm4/themerc${color}" "${HDPI_TARGET_DIR}/xfwm4/themerc" + + mkdir -p "${XHDPI_TARGET_DIR}/xfwm4" + cp -r "${THEME_SRC_DIR}/assets/xfwm4/assets${color}-xhdpi/"*".png" "${XHDPI_TARGET_DIR}/xfwm4" + cp -r "${THEME_SRC_DIR}/main/xfwm4/themerc${color}" "${XHDPI_TARGET_DIR}/xfwm4/themerc" +} + install_shelly() { local color="$(destify ${1})" local opacity="$(destify ${2})" @@ -176,9 +196,6 @@ install_theemy() { local TMP_DIR_T="${WHITESUR_TMP_DIR}/gtk-3.0${color}${opacity}${alt}${theme}" local TMP_DIR_F="${WHITESUR_TMP_DIR}/gtk-4.0${color}${opacity}${alt}${theme}" - local HDPI_TARGET_DIR="${dest}/${name}${color}-hdpi" - local XHDPI_TARGET_DIR="${dest}/${name}${color}-xhdpi" - mkdir -p "${TARGET_DIR}" local desktop_entry=" [Desktop Entry] @@ -272,24 +289,13 @@ install_theemy() { cp -r "${THEME_SRC_DIR}/assets/metacity-1/thumbnail${color}.png" "${TARGET_DIR}/metacity-1/thumbnail.png" ( cd "${TARGET_DIR}/metacity-1" && ln -s "metacity-theme-1.xml" "metacity-theme-2.xml" ) - mkdir -p "${TARGET_DIR}/xfwm4" - cp -r "${THEME_SRC_DIR}/assets/xfwm4/assets${color}/"*".png" "${TARGET_DIR}/xfwm4" - cp -r "${THEME_SRC_DIR}/main/xfwm4/themerc${color}" "${TARGET_DIR}/xfwm4/themerc" - - mkdir -p "${HDPI_TARGET_DIR}/xfwm4" - cp -r "${THEME_SRC_DIR}/assets/xfwm4/assets${color}-hdpi/"*".png" "${HDPI_TARGET_DIR}/xfwm4" - cp -r "${THEME_SRC_DIR}/main/xfwm4/themerc${color}" "${HDPI_TARGET_DIR}/xfwm4/themerc" - - mkdir -p "${XHDPI_TARGET_DIR}/xfwm4" - cp -r "${THEME_SRC_DIR}/assets/xfwm4/assets${color}-xhdpi/"*".png" "${XHDPI_TARGET_DIR}/xfwm4" - cp -r "${THEME_SRC_DIR}/main/xfwm4/themerc${color}" "${XHDPI_TARGET_DIR}/xfwm4/themerc" - mkdir -p "${TARGET_DIR}/plank" cp -r "${THEME_SRC_DIR}/other/plank/theme${color}/"*".theme" "${TARGET_DIR}/plank" } remove_packy() { rm -rf "${dest}/${name}$(destify ${1})$(destify ${2})$(destify ${3})$(destify ${4})" + rm -rf "${dest}/${name}$(destify ${1})-mdpi" rm -rf "${dest}/${name}$(destify ${1})-hdpi" rm -rf "${dest}/${name}$(destify ${1})-xhdpi" } @@ -305,6 +311,9 @@ install_themes() { for opacity in "${opacities[@]}"; do for alt in "${alts[@]}"; do for theme in "${themes[@]}"; do + install_xfwmy "${color}" & + + # Darky is required by Theemy, don't make it a background process ("&") install_darky "${opacity}" "${theme}" for color in "${colors[@]}"; do diff --git a/tweaks.sh b/tweaks.sh index dd11bb37..e805e1ad 100755 --- a/tweaks.sh +++ b/tweaks.sh @@ -196,7 +196,7 @@ else echo prompt -w "FIREFOX: Please go to [Firefox menu] > [Customize...], and customize your Firefox to make it work. Move your 'new tab' button to the titlebar instead of tab-switcher." - prompt -w "FIREFOX: Anyways, you can also edit 'userChrome.css' and 'customChrome.css' later in '${FIREFOX_DIR_HOME}/WhiteSur-chrome'." + prompt -w "FIREFOX: Anyways, you can also edit 'userChrome.css' and 'customChrome.css' later in '${FIREFOX_THEME_DIR}'." fi if [[ "${snap}" == 'true' ]]; then