diff --git a/install.sh b/install.sh index 40a7865..b2dd01d 100755 --- a/install.sh +++ b/install.sh @@ -87,7 +87,6 @@ install() { echo "CursorTheme=Vimix${ELSE_DARK:-}" >> "$THEME_DIR/index.theme" echo "ButtonLayout=close,minimize,maximize:menu" >> "$THEME_DIR/index.theme" - if [[ "$color" != '-light' ]]; then mkdir -p "$THEME_DIR/gnome-shell" cp -r "$SRC_DIR/gnome-shell/pad-osd.css" "$THEME_DIR/gnome-shell" @@ -107,7 +106,6 @@ install() { ln -s assets/no-events.svg no-events.svg ln -s assets/process-working.svg process-working.svg ln -s assets/no-notifications.svg no-notifications.svg - fi mkdir -p "$THEME_DIR/gtk-2.0" cp -r "$SRC_DIR/gtk-2.0/common/"{apps.rc,hacks.rc,main.rc} "$THEME_DIR/gtk-2.0" @@ -129,28 +127,22 @@ install() { [[ "$color" != '-dark' ]] && \ cp -r "$SRC_DIR/gtk/4.0/gtk$theme-dark$size.css" "$THEME_DIR/gtk-4.0/gtk-dark.css" - if [[ "$theme" == '' && "$size" == '' ]]; then - if [[ "$color" != '' ]]; then - mkdir -p "$THEME_DIR/xfwm4" - cp -r "$SRC_DIR/xfwm4/assets${ELSE_LIGHT:-}/"*.png "$THEME_DIR/xfwm4" - cp -r "$SRC_DIR/xfwm4/themerc${ELSE_LIGHT:-}" "$THEME_DIR/xfwm4/themerc" - fi - - if [[ "$color" != '-light' ]]; then - mkdir -p "$THEME_DIR/cinnamon" - cp -r "$SRC_DIR/cinnamon/common-assets" "$THEME_DIR/cinnamon/assets" - cp -r "$SRC_DIR/cinnamon/assets${ELSE_DARK:-}/"*.svg "$THEME_DIR/cinnamon/assets" - cp -r "$SRC_DIR/cinnamon/cinnamon${ELSE_DARK:-}.css" "$THEME_DIR/cinnamon/cinnamon.css" - cp -r "$SRC_DIR/cinnamon/thumbnail${ELSE_DARK:-}.png" "$THEME_DIR/cinnamon/thumbnail.png" - fi - - mkdir -p "$THEME_DIR/metacity-1" - cp -r "$SRC_DIR/metacity-1/metacity-theme-2${color}.xml" "$THEME_DIR/metacity-1/metacity-theme-2.xml" - cp -r "$SRC_DIR/metacity-1/metacity-theme-3.xml" "$THEME_DIR/metacity-1" - cp -r "$SRC_DIR/metacity-1/assets" "$THEME_DIR/metacity-1" - cp -r "$SRC_DIR/metacity-1/thumbnail${ELSE_DARK:-}.png" "$THEME_DIR/metacity-1/thumbnail.png" - cd "$THEME_DIR/metacity-1" && ln -s metacity-theme-2.xml metacity-theme-1.xml - fi + mkdir -p "$THEME_DIR/xfwm4" + cp -r "$SRC_DIR/xfwm4/assets${ELSE_LIGHT:-}/"*.png "$THEME_DIR/xfwm4" + cp -r "$SRC_DIR/xfwm4/themerc${ELSE_LIGHT:-}" "$THEME_DIR/xfwm4/themerc" + + mkdir -p "$THEME_DIR/cinnamon" + cp -r "$SRC_DIR/cinnamon/common-assets" "$THEME_DIR/cinnamon/assets" + cp -r "$SRC_DIR/cinnamon/assets${ELSE_DARK:-}/"*.svg "$THEME_DIR/cinnamon/assets" + cp -r "$SRC_DIR/cinnamon/cinnamon${ELSE_DARK:-}.css" "$THEME_DIR/cinnamon/cinnamon.css" + cp -r "$SRC_DIR/cinnamon/thumbnail${ELSE_DARK:-}.png" "$THEME_DIR/cinnamon/thumbnail.png" + + mkdir -p "$THEME_DIR/metacity-1" + cp -r "$SRC_DIR/metacity-1/metacity-theme-2${color}.xml" "$THEME_DIR/metacity-1/metacity-theme-2.xml" + cp -r "$SRC_DIR/metacity-1/metacity-theme-3.xml" "$THEME_DIR/metacity-1" + cp -r "$SRC_DIR/metacity-1/assets" "$THEME_DIR/metacity-1" + cp -r "$SRC_DIR/metacity-1/thumbnail${ELSE_DARK:-}.png" "$THEME_DIR/metacity-1/thumbnail.png" + cd "$THEME_DIR/metacity-1" && ln -s metacity-theme-2.xml metacity-theme-1.xml mkdir -p "$THEME_DIR/plank" cp -r "$SRC_DIR/plank/dock.theme" "$THEME_DIR/plank"