This commit is contained in:
vinceliuice
2023-08-12 23:52:57 +08:00
parent b3ceea1b71
commit a0f7fadfbe
2 changed files with 85 additions and 72 deletions

View File

@@ -46,11 +46,11 @@ Run the following commands in the terminal:
-u, --uninstall Uninstall/Remove installed themes or links -u, --uninstall Uninstall/Remove installed themes or links
--tweaks Specify versions for tweaks --tweaks Specify versions for tweaks
1. [nord|dracula|gruvbox] Nord|Dracula|gruvbox ColorSchemes version 1. [nord|dracula|gruvbox|all] (Nord/Dracula/gruvbox/all) ColorSchemes version
2. black Blackness color version 2. black Blackness color version
3. rimless Remove the 1px border about windows and menus 3. rimless Remove the 1px border about windows and menus
4. normal Normal windows button style like gnome default theme (titlebuttons: max/min/close) 4. normal Normal windows button style like gnome default theme (titlebuttons: max/min/close)
5. float Floating gnome-shell panel style 5. float Floating gnome-shell panel style
-h, --help Show help -h, --help Show help
``` ```

View File

@@ -10,7 +10,7 @@ source "${REPO_DIR}/gtkrc.sh"
ROOT_UID=0 ROOT_UID=0
DEST_DIR= DEST_DIR=
ctype= scheme=
window= window=
# Destination directory # Destination directory
@@ -24,6 +24,7 @@ SASSC_OPT="-M -t expanded"
THEME_NAME=Colloid THEME_NAME=Colloid
THEME_VARIANTS=('' '-Purple' '-Pink' '-Red' '-Orange' '-Yellow' '-Green' '-Teal' '-Grey') THEME_VARIANTS=('' '-Purple' '-Pink' '-Red' '-Orange' '-Yellow' '-Green' '-Teal' '-Grey')
SCHEME_VARIANTS=('' '-Nord' '-Dracula' '-Gruvbox')
COLOR_VARIANTS=('' '-Light' '-Dark') COLOR_VARIANTS=('' '-Light' '-Dark')
SIZE_VARIANTS=('' '-Compact') SIZE_VARIANTS=('' '-Compact')
@@ -65,11 +66,11 @@ OPTIONS:
-u, --uninstall Uninstall/Remove installed themes or links -u, --uninstall Uninstall/Remove installed themes or links
--tweaks Specify versions for tweaks --tweaks Specify versions for tweaks
1. [nord|dracula|gruvbox] Nord|Dracula|gruvbox ColorSchemes version 1. [nord|dracula|gruvbox|all] Nord|Dracula|gruvbox|all ColorSchemes version
2. black Blackness color version 2. black Blackness color version
3. rimless Remove the 1px border about windows and menus 3. rimless Remove the 1px border about windows and menus
4. normal Normal windows button style like gnome default theme (titlebuttons: max/min/close) 4. normal Normal windows button style like gnome default theme (titlebuttons: max/min/close)
5. float Floating gnome-shell panel style 5. float Floating gnome-shell panel style
-h, --help Show help -h, --help Show help
EOF EOF
@@ -81,7 +82,7 @@ install() {
local theme="${3}" local theme="${3}"
local color="${4}" local color="${4}"
local size="${5}" local size="${5}"
local ctype="${6}" local scheme="${6}"
local window="${7}" local window="${7}"
[[ "${color}" == '-Light' ]] && local ELSE_LIGHT="${color}" [[ "${color}" == '-Light' ]] && local ELSE_LIGHT="${color}"
@@ -116,7 +117,7 @@ install() {
cp -r "${SRC_DIR}/assets/gnome-shell/common-assets" "${THEME_DIR}/gnome-shell/assets" cp -r "${SRC_DIR}/assets/gnome-shell/common-assets" "${THEME_DIR}/gnome-shell/assets"
cp -r "${SRC_DIR}/assets/gnome-shell/assets${ELSE_DARK:-}/"*.svg "${THEME_DIR}/gnome-shell/assets" cp -r "${SRC_DIR}/assets/gnome-shell/assets${ELSE_DARK:-}/"*.svg "${THEME_DIR}/gnome-shell/assets"
cp -r "${SRC_DIR}/assets/gnome-shell/theme${theme}${ctype}/"*.svg "${THEME_DIR}/gnome-shell/assets" cp -r "${SRC_DIR}/assets/gnome-shell/theme${theme}${scheme}/"*.svg "${THEME_DIR}/gnome-shell/assets"
cd "${THEME_DIR}/gnome-shell" cd "${THEME_DIR}/gnome-shell"
ln -s assets/no-events.svg no-events.svg ln -s assets/no-events.svg no-events.svg
@@ -124,31 +125,31 @@ install() {
ln -s assets/no-notifications.svg no-notifications.svg ln -s assets/no-notifications.svg no-notifications.svg
mkdir -p "${THEME_DIR}/gtk-2.0" mkdir -p "${THEME_DIR}/gtk-2.0"
# cp -r "${SRC_DIR}/main/gtk-2.0/gtkrc${theme}${ELSE_DARK:-}${ctype}" "${THEME_DIR}/gtk-2.0/gtkrc" # cp -r "${SRC_DIR}/main/gtk-2.0/gtkrc${theme}${ELSE_DARK:-}${scheme}" "${THEME_DIR}/gtk-2.0/gtkrc"
cp -r "${SRC_DIR}/main/gtk-2.0/common/"*'.rc' "${THEME_DIR}/gtk-2.0" cp -r "${SRC_DIR}/main/gtk-2.0/common/"*'.rc' "${THEME_DIR}/gtk-2.0"
cp -r "${SRC_DIR}/assets/gtk-2.0/assets-common${ELSE_DARK:-}" "${THEME_DIR}/gtk-2.0/assets" cp -r "${SRC_DIR}/assets/gtk-2.0/assets-common${ELSE_DARK:-}" "${THEME_DIR}/gtk-2.0/assets"
cp -r "${SRC_DIR}/assets/gtk-2.0/assets${theme}${ELSE_DARK:-}${ctype}/"*"png" "${THEME_DIR}/gtk-2.0/assets" cp -r "${SRC_DIR}/assets/gtk-2.0/assets${theme}${ELSE_DARK:-}${scheme}/"*"png" "${THEME_DIR}/gtk-2.0/assets"
mkdir -p "${THEME_DIR}/gtk-3.0" mkdir -p "${THEME_DIR}/gtk-3.0"
cp -r "${SRC_DIR}/assets/gtk/assets${theme}${ctype}" "${THEME_DIR}/gtk-3.0/assets" cp -r "${SRC_DIR}/assets/gtk/assets${theme}${scheme}" "${THEME_DIR}/gtk-3.0/assets"
cp -r "${SRC_DIR}/assets/gtk/scalable" "${THEME_DIR}/gtk-3.0/assets" cp -r "${SRC_DIR}/assets/gtk/scalable" "${THEME_DIR}/gtk-3.0/assets"
cp -r "${SRC_DIR}/assets/gtk/thumbnails/thumbnail${theme}${ctype}${ELSE_DARK:-}.png" "${THEME_DIR}/gtk-3.0/thumbnail.png" cp -r "${SRC_DIR}/assets/gtk/thumbnails/thumbnail${theme}${scheme}${ELSE_DARK:-}.png" "${THEME_DIR}/gtk-3.0/thumbnail.png"
sassc $SASSC_OPT "${SRC_DIR}/main/gtk-3.0/gtk${color}.scss" "${THEME_DIR}/gtk-3.0/gtk.css" sassc $SASSC_OPT "${SRC_DIR}/main/gtk-3.0/gtk${color}.scss" "${THEME_DIR}/gtk-3.0/gtk.css"
sassc $SASSC_OPT "${SRC_DIR}/main/gtk-3.0/gtk-Dark.scss" "${THEME_DIR}/gtk-3.0/gtk-dark.css" sassc $SASSC_OPT "${SRC_DIR}/main/gtk-3.0/gtk-Dark.scss" "${THEME_DIR}/gtk-3.0/gtk-dark.css"
mkdir -p "${THEME_DIR}/gtk-4.0" mkdir -p "${THEME_DIR}/gtk-4.0"
cp -r "${SRC_DIR}/assets/gtk/assets${theme}${ctype}" "${THEME_DIR}/gtk-4.0/assets" cp -r "${SRC_DIR}/assets/gtk/assets${theme}${scheme}" "${THEME_DIR}/gtk-4.0/assets"
cp -r "${SRC_DIR}/assets/gtk/scalable" "${THEME_DIR}/gtk-4.0/assets" cp -r "${SRC_DIR}/assets/gtk/scalable" "${THEME_DIR}/gtk-4.0/assets"
cp -r "${SRC_DIR}/assets/gtk/thumbnails/thumbnail${theme}${ctype}${ELSE_DARK:-}.png" "${THEME_DIR}/gtk-4.0/thumbnail.png" cp -r "${SRC_DIR}/assets/gtk/thumbnails/thumbnail${theme}${scheme}${ELSE_DARK:-}.png" "${THEME_DIR}/gtk-4.0/thumbnail.png"
sassc $SASSC_OPT "${SRC_DIR}/main/gtk-4.0/gtk${color}.scss" "${THEME_DIR}/gtk-4.0/gtk.css" sassc $SASSC_OPT "${SRC_DIR}/main/gtk-4.0/gtk${color}.scss" "${THEME_DIR}/gtk-4.0/gtk.css"
sassc $SASSC_OPT "${SRC_DIR}/main/gtk-4.0/gtk-Dark.scss" "${THEME_DIR}/gtk-4.0/gtk-dark.css" sassc $SASSC_OPT "${SRC_DIR}/main/gtk-4.0/gtk-Dark.scss" "${THEME_DIR}/gtk-4.0/gtk-dark.css"
mkdir -p "${THEME_DIR}/cinnamon" mkdir -p "${THEME_DIR}/cinnamon"
cp -r "${SRC_DIR}/assets/cinnamon/common-assets" "${THEME_DIR}/cinnamon/assets" cp -r "${SRC_DIR}/assets/cinnamon/common-assets" "${THEME_DIR}/cinnamon/assets"
cp -r "${SRC_DIR}/assets/cinnamon/assets${ELSE_DARK:-}/"*'.svg' "${THEME_DIR}/cinnamon/assets" cp -r "${SRC_DIR}/assets/cinnamon/assets${ELSE_DARK:-}/"*'.svg' "${THEME_DIR}/cinnamon/assets"
cp -r "${SRC_DIR}/assets/cinnamon/theme${theme}${ctype}/"*'.svg' "${THEME_DIR}/cinnamon/assets" cp -r "${SRC_DIR}/assets/cinnamon/theme${theme}${scheme}/"*'.svg' "${THEME_DIR}/cinnamon/assets"
sassc $SASSC_OPT "${SRC_DIR}/main/cinnamon/cinnamon${color}.scss" "${THEME_DIR}/cinnamon/cinnamon.css" sassc $SASSC_OPT "${SRC_DIR}/main/cinnamon/cinnamon${color}.scss" "${THEME_DIR}/cinnamon/cinnamon.css"
cp -r "${SRC_DIR}/assets/cinnamon/thumbnails/thumbnail${theme}${ctype}${color}.png" "${THEME_DIR}/cinnamon/thumbnail.png" cp -r "${SRC_DIR}/assets/cinnamon/thumbnails/thumbnail${theme}${scheme}${color}.png" "${THEME_DIR}/cinnamon/thumbnail.png"
mkdir -p "${THEME_DIR}/metacity-1" mkdir -p "${THEME_DIR}/metacity-1"
cp -r "${SRC_DIR}/main/metacity-1/metacity-theme-3${window}.xml" "${THEME_DIR}/metacity-1/metacity-theme-3.xml" cp -r "${SRC_DIR}/main/metacity-1/metacity-theme-3${window}.xml" "${THEME_DIR}/metacity-1/metacity-theme-3.xml"
@@ -157,22 +158,22 @@ install() {
cd "${THEME_DIR}/metacity-1" && ln -s metacity-theme-3.xml metacity-theme-1.xml && ln -s metacity-theme-3.xml metacity-theme-2.xml cd "${THEME_DIR}/metacity-1" && ln -s metacity-theme-3.xml metacity-theme-1.xml && ln -s metacity-theme-3.xml metacity-theme-2.xml
mkdir -p "${THEME_DIR}/xfwm4" mkdir -p "${THEME_DIR}/xfwm4"
cp -r "${SRC_DIR}/assets/xfwm4/assets${ELSE_LIGHT:-}${ctype}${window}/"*.png "${THEME_DIR}/xfwm4" cp -r "${SRC_DIR}/assets/xfwm4/assets${ELSE_LIGHT:-}${scheme}${window}/"*.png "${THEME_DIR}/xfwm4"
cp -r "${SRC_DIR}/main/xfwm4/themerc${ELSE_LIGHT:-}" "${THEME_DIR}/xfwm4/themerc" cp -r "${SRC_DIR}/main/xfwm4/themerc${ELSE_LIGHT:-}" "${THEME_DIR}/xfwm4/themerc"
mkdir -p "${THEME_DIR}-hdpi/xfwm4" mkdir -p "${THEME_DIR}-hdpi/xfwm4"
cp -r "${SRC_DIR}/assets/xfwm4/assets${ELSE_LIGHT:-}${ctype}${window}-hdpi/"*.png "${THEME_DIR}-hdpi/xfwm4" cp -r "${SRC_DIR}/assets/xfwm4/assets${ELSE_LIGHT:-}${scheme}${window}-hdpi/"*.png "${THEME_DIR}-hdpi/xfwm4"
cp -r "${SRC_DIR}/main/xfwm4/themerc${ELSE_LIGHT:-}" "${THEME_DIR}-hdpi/xfwm4/themerc" cp -r "${SRC_DIR}/main/xfwm4/themerc${ELSE_LIGHT:-}" "${THEME_DIR}-hdpi/xfwm4/themerc"
sed -i "s/button_offset=6/button_offset=9/" "${THEME_DIR}-hdpi/xfwm4/themerc" sed -i "s/button_offset=6/button_offset=9/" "${THEME_DIR}-hdpi/xfwm4/themerc"
mkdir -p "${THEME_DIR}-xhdpi/xfwm4" mkdir -p "${THEME_DIR}-xhdpi/xfwm4"
cp -r "${SRC_DIR}/assets/xfwm4/assets${ELSE_LIGHT:-}${ctype}${window}-xhdpi/"*.png "${THEME_DIR}-xhdpi/xfwm4" cp -r "${SRC_DIR}/assets/xfwm4/assets${ELSE_LIGHT:-}${scheme}${window}-xhdpi/"*.png "${THEME_DIR}-xhdpi/xfwm4"
cp -r "${SRC_DIR}/main/xfwm4/themerc${ELSE_LIGHT:-}" "${THEME_DIR}-xhdpi/xfwm4/themerc" cp -r "${SRC_DIR}/main/xfwm4/themerc${ELSE_LIGHT:-}" "${THEME_DIR}-xhdpi/xfwm4/themerc"
sed -i "s/button_offset=6/button_offset=12/" "${THEME_DIR}-xhdpi/xfwm4/themerc" sed -i "s/button_offset=6/button_offset=12/" "${THEME_DIR}-xhdpi/xfwm4/themerc"
mkdir -p "${THEME_DIR}/plank" mkdir -p "${THEME_DIR}/plank"
if [[ "$color" == '-Light' ]]; then if [[ "$color" == '-Light' ]]; then
cp -r "${SRC_DIR}/main/plank/theme-Light${ctype}/"* "${THEME_DIR}/plank" cp -r "${SRC_DIR}/main/plank/theme-Light${scheme}/"* "${THEME_DIR}/plank"
else else
cp -r "${SRC_DIR}/main/plank/theme-Dark${ctype}/"* "${THEME_DIR}/plank" cp -r "${SRC_DIR}/main/plank/theme-Dark${scheme}/"* "${THEME_DIR}/plank"
fi fi
} }
@@ -180,6 +181,7 @@ themes=()
colors=() colors=()
sizes=() sizes=()
lcolors=() lcolors=()
schemes=()
while [[ $# -gt 0 ]]; do while [[ $# -gt 0 ]]; do
case "${1}" in case "${1}" in
@@ -318,23 +320,28 @@ while [[ $# -gt 0 ]]; do
for variant in $@; do for variant in $@; do
case "$variant" in case "$variant" in
nord) nord)
nord="true" colorscheme='true'
ctype="-Nord" schemes+=("${SCHEME_VARIANTS[1]}")
echo -e "Nord ColorScheme version! ..." echo -e "Nord ColorScheme version! ..."
shift shift
;; ;;
dracula) dracula)
dracula="true" colorscheme='true'
ctype="-Dracula" schemes+=("${SCHEME_VARIANTS[2]}")
echo -e "Dracula ColorScheme version! ..." echo -e "Dracula ColorScheme version! ..."
shift shift
;; ;;
gruvbox) gruvbox)
gruvbox="true" colorscheme='true'
ctype="-Gruvbox" schemes+=("${SCHEME_VARIANTS[3]}")
echo -e "Gruvbox ColorScheme version! ..." echo -e "Gruvbox ColorScheme version! ..."
shift shift
;; ;;
all)
colorscheme='true'
schemes+=("${SCHEME_VARIANTS[@]}")
shift
;;
black) black)
blackness="true" blackness="true"
echo -e "Blackness version! ..." echo -e "Blackness version! ..."
@@ -395,6 +402,10 @@ if [[ "${#sizes[@]}" -eq 0 ]] ; then
sizes=("${SIZE_VARIANTS[0]}") sizes=("${SIZE_VARIANTS[0]}")
fi fi
if [[ "${#schemes[@]}" -eq 0 ]] ; then
schemes=("${SCHEME_VARIANTS[0]}")
fi
# Check command avalibility # Check command avalibility
function has_command() { function has_command() {
command -v $1 > /dev/null command -v $1 > /dev/null
@@ -426,19 +437,22 @@ compact_size() {
sed -i "/\$compact:/s/false/true/" "${SRC_DIR}/sass/_tweaks-temp.scss" sed -i "/\$compact:/s/false/true/" "${SRC_DIR}/sass/_tweaks-temp.scss"
} }
nord_color() { color_schemes() {
sed -i "/\@import/s/color-palette-default/color-palette-nord/" "${SRC_DIR}/sass/_tweaks-temp.scss" if [[ "$scheme" != '' ]]; then
sed -i "/\$colorscheme:/s/default/nord/" "${SRC_DIR}/sass/_tweaks-temp.scss" case "$scheme" in
} -Nord)
scheme_color='nord'
dracula_color() { ;;
sed -i "/\@import/s/color-palette-default/color-palette-dracula/" "${SRC_DIR}/sass/_tweaks-temp.scss" -Dracula)
sed -i "/\$colorscheme:/s/default/dracula/" "${SRC_DIR}/sass/_tweaks-temp.scss" scheme_color='dracula'
} ;;
-Gruvbox)
gruvbox_color() { scheme_color='gruvbox'
sed -i "/\@import/s/color-palette-default/color-palette-gruvbox/" "${SRC_DIR}/sass/_tweaks-temp.scss" ;;
sed -i "/\$colorscheme:/s/default/gruvbox/" "${SRC_DIR}/sass/_tweaks-temp.scss" esac
sed -i "/\@import/s/color-palette-default/color-palette-${scheme_color}/" "${SRC_DIR}/sass/_tweaks-temp.scss"
sed -i "/\$colorscheme:/s/default/${scheme_color}/" "${SRC_DIR}/sass/_tweaks-temp.scss"
fi
} }
blackness_color() { blackness_color() {
@@ -495,45 +509,40 @@ theme_color() {
theme_color='grey' theme_color='grey'
;; ;;
esac esac
tweaks_temp
sed -i "/\$theme:/s/default/${theme_color}/" "${SRC_DIR}/sass/_tweaks-temp.scss" sed -i "/\$theme:/s/default/${theme_color}/" "${SRC_DIR}/sass/_tweaks-temp.scss"
fi fi
} }
theme_tweaks() { theme_tweaks() {
if [[ "$accent" = "true" ]] ; then if [[ "$accent" = "true" || "$colorscheme" = "true" ]]; then
tweaks_temp
fi
if [[ "$accent" = "true" ]]; then
theme_color theme_color
fi fi
if [[ "$compact" = "true" ]] ; then if [[ "$compact" = "true" ]]; then
compact_size compact_size
fi fi
if [[ "$nord" = "true" ]] ; then if [[ "$colorscheme" = "true" ]] ; then
nord_color color_schemes
fi fi
if [[ "$dracula" = "true" ]] ; then if [[ "$blackness" = "true" ]]; then
dracula_color
fi
if [[ "$gruvbox" = "true" ]] ; then
gruvbox_color
fi
if [[ "$blackness" = "true" ]] ; then
blackness_color blackness_color
fi fi
if [[ "$rimless" = "true" ]] ; then if [[ "$rimless" = "true" ]]; then
border_rimless border_rimless
fi fi
if [[ "$normal" = "true" ]] ; then if [[ "$normal" = "true" ]]; then
normal_winbutton normal_winbutton
fi fi
if [[ "$float" = "true" ]] ; then if [[ "$float" = "true" ]]; then
float_panel float_panel
fi fi
} }
@@ -548,7 +557,7 @@ link_libadwaita() {
local theme="${3}" local theme="${3}"
local color="${4}" local color="${4}"
local size="${5}" local size="${5}"
local ctype="${6}" local scheme="${6}"
local THEME_DIR="${1}/${2}${3}${4}${5}${6}" local THEME_DIR="${1}/${2}${3}${4}${5}${6}"
@@ -566,7 +575,9 @@ link_theme() {
for theme in "${themes[@]}"; do for theme in "${themes[@]}"; do
for color in "${lcolors[@]}"; do for color in "${lcolors[@]}"; do
for size in "${sizes[@]}"; do for size in "${sizes[@]}"; do
link_libadwaita "${dest:-$DEST_DIR}" "${name:-$THEME_NAME}" "$theme" "$color" "$size" "$ctype" for scheme in "${schemes[@]}"; do
link_libadwaita "${dest:-$DEST_DIR}" "${name:-$THEME_NAME}" "$theme" "$color" "$size" "$scheme"
done
done done
done done
done done
@@ -578,12 +589,12 @@ clean() {
local theme="${3}" local theme="${3}"
local color="${4}" local color="${4}"
local size="${5}" local size="${5}"
local type="${6}" local scheme="${6}"
local screen="${7}" local screen="${7}"
local THEME_DIR="${1}/${2}${3}${4}${5}${6}${7}" local THEME_DIR="${1}/${2}${3}${4}${5}${6}${7}"
if [[ ${theme} == '' && ${color} == '' && ${size} == '' && ${type} == '' ]]; then if [[ ${theme} == '' && ${color} == '' && ${size} == '' && ${scheme} == '' ]]; then
cleantheme='none' cleantheme='none'
elif [[ -d ${THEME_DIR} ]]; then elif [[ -d ${THEME_DIR} ]]; then
rm -rf ${THEME_DIR} rm -rf ${THEME_DIR}
@@ -595,9 +606,9 @@ clean_theme() {
for theme in '' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-teal' '-grey'; do for theme in '' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-teal' '-grey'; do
for color in '' '-light' '-dark'; do for color in '' '-light' '-dark'; do
for size in '' '-compact'; do for size in '' '-compact'; do
for type in '' '-nord' '-dracula' '-gruvbox'; do for scheme in '' '-nord' '-dracula' '-gruvbox'; do
for screen in '' '-hdpi' '-xhdpi'; do for screen in '' '-hdpi' '-xhdpi'; do
clean "${dest:-${DEST_DIR}}" "${name:-${THEME_NAME}}" "${theme}" "${color}" "${size}" "${type}" "${screen}" clean "${dest:-${DEST_DIR}}" "${name:-${THEME_NAME}}" "${theme}" "${color}" "${size}" "${scheme}" "${screen}"
done done
done done
done done
@@ -609,8 +620,10 @@ install_theme() {
for theme in "${themes[@]}"; do for theme in "${themes[@]}"; do
for color in "${colors[@]}"; do for color in "${colors[@]}"; do
for size in "${sizes[@]}"; do for size in "${sizes[@]}"; do
install "${dest:-$DEST_DIR}" "${name:-$THEME_NAME}" "$theme" "$color" "$size" "$ctype" "$window" for scheme in "${schemes[@]}"; do
make_gtkrc "${dest:-$DEST_DIR}" "${name:-$THEME_NAME}" "$theme" "$color" "$size" "$ctype" "$window" install "${dest:-$DEST_DIR}" "${name:-$THEME_NAME}" "$theme" "$color" "$size" "$scheme" "$window"
make_gtkrc "${dest:-$DEST_DIR}" "${name:-$THEME_NAME}" "$theme" "$color" "$size" "$scheme" "$window"
done
done done
done done
done done
@@ -630,7 +643,7 @@ uninstall() {
local theme="${3}" local theme="${3}"
local color="${4}" local color="${4}"
local size="${5}" local size="${5}"
local ctype="${6}" local scheme="${6}"
local THEME_DIR="${1}/${2}${3}${4}${5}${6}" local THEME_DIR="${1}/${2}${3}${4}${5}${6}"
@@ -644,7 +657,7 @@ uninstall_theme() {
for theme in "${themes[@]}"; do for theme in "${themes[@]}"; do
for color in "${colors[@]}"; do for color in "${colors[@]}"; do
for size in "${sizes[@]}"; do for size in "${sizes[@]}"; do
uninstall "${dest:-$DEST_DIR}" "${name:-$THEME_NAME}" "$theme" "$color" "$size" "$ctype" uninstall "${dest:-$DEST_DIR}" "${name:-$THEME_NAME}" "$theme" "$color" "$size" "$scheme"
done done
done done
done done