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

critical update

Browse Source
This commit is contained in:
Muhammad Rivan 2021-04-19 18:35:20 +07:00
parent 0fb5c77289
commit 24ed623d47
No known key found for this signature in database
GPG Key ID: 662FD6DBB0E54B78
3 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib-core.sh
View File

@ -460,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"
error_msg="$(sudo ${@} 2>&1)" || operation_canceled sudo ${@} 2> "${WHITESUR_TMP_DIR}/error_log.txt" || operation_canceled
trap sig_c SIGINT trap sig_c SIGINT
} }
@ -473,7 +473,7 @@ full_rootify() {
userify() { userify() {
trap true SIGINT 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 trap sig_c SIGINT
} }
@ -485,6 +485,10 @@ sig_c() {
operation_canceled() { operation_canceled() {
clear clear
if [[ -f "${WHITESUR_TMP_DIR}/error_log.txt" ]]; then
error_msg="$(cat "${WHITESUR_TMP_DIR}/error_log.txt")"
fi
if [[ ${error_msg} != "" ]]; then if [[ ${error_msg} != "" ]]; then
prompt -e "\n\n Oops! An error is detected...\n" prompt -e "\n\n Oops! An error is detected...\n"
prompt -e "ERROR LOG:\n${error_msg}\n" prompt -e "ERROR LOG:\n${error_msg}\n"

39
lib-install.sh
View File

@ -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" 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() { install_shelly() {
local color="$(destify ${1})" local color="$(destify ${1})"
local opacity="$(destify ${2})" 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_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 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}" mkdir -p "${TARGET_DIR}"
local desktop_entry=" local desktop_entry="
[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" 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" ) ( 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" mkdir -p "${TARGET_DIR}/plank"
cp -r "${THEME_SRC_DIR}/other/plank/theme${color}/"*".theme" "${TARGET_DIR}/plank" cp -r "${THEME_SRC_DIR}/other/plank/theme${color}/"*".theme" "${TARGET_DIR}/plank"
} }
remove_packy() { remove_packy() {
rm -rf "${dest}/${name}$(destify ${1})$(destify ${2})$(destify ${3})$(destify ${4})" 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})-hdpi"
rm -rf "${dest}/${name}$(destify ${1})-xhdpi" rm -rf "${dest}/${name}$(destify ${1})-xhdpi"
} }
@ -305,6 +311,9 @@ install_themes() {
for opacity in "${opacities[@]}"; do for opacity in "${opacities[@]}"; do
for alt in "${alts[@]}"; do for alt in "${alts[@]}"; do
for theme in "${themes[@]}"; 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}" install_darky "${opacity}" "${theme}"
for color in "${colors[@]}"; do for color in "${colors[@]}"; do

2
tweaks.sh
View File

@ -196,7 +196,7 @@ else
echo 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: 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 fi
if [[ "${snap}" == 'true' ]]; then if [[ "${snap}" == 'true' ]]; then