From 721eea2b4377188bef00502e55c30d62e7657803 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Sat, 16 Jan 2021 13:03:58 +0800 Subject: [PATCH] update --- README.md | 8 ++++---- install.sh | 12 ++++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 40da2827..d35ae0b2 100644 --- a/README.md +++ b/README.md @@ -45,8 +45,8 @@ Usage: `./install.sh` **[OPTIONS...]** |-n, --name | Specify theme name (Default: WhiteSur)| |-c, --color | Specify theme color variant(s) **[light/dark]** (Default: All variants)| |-o, --opacity | Specify theme opacity variant(s) **[standard/solid]** (Default: All variants)| -|-a, --alt | Specify titlebutton variant(s) **[standard/alt]** (Default: All variants)| -|-t, --theme | Specify primary theme color variant(s) **[default/blue/purple/pink/red/orange/yellow/green/grey]** (Default: MacOS blue)| +|-a, --alt | Specify titlebutton variant(s) **[standard/alt/all]** (Default: All variants)| +|-t, --theme | Specify primary theme color variant(s) **[default/blue/purple/pink/red/orange/yellow/green/grey/all]** (Default: MacOS blue)| |-p, --panel | Change the panel opacty **[default/25/35/45/55/65/75/85]** (Default: 16)| |-s, --size | Change the nautilus sidebar width size **[default/220/240/260/280]** (Default: 200px)| |-i, --icon | Activities icon variant(s) **[standard/normal/gnome/ubuntu/arch/manjaro/fedora/debian/void]** (Default: standard variant)| @@ -59,9 +59,9 @@ Usage: `./install.sh` **[OPTIONS...]** If you want to change primary theme color! (Default color is MacOS blue) then you can run: `for example` ```bash -./install.sh -t green # Install green accent color version +./install.sh -t green # Install green primary(accent) color version -./install.sh -c dark -o solid -t all # Install All accent color dark solid versions +./install.sh -c dark -o solid -t all # Install All primary(accent) color dark solid versions ``` ![1](https://github.com/vinceliuice/WhiteSur-gtk-theme/blob/pictures/pictures/install-tip-01.png) diff --git a/install.sh b/install.sh index 557ad0ba..de05643f 100755 --- a/install.sh +++ b/install.sh @@ -74,7 +74,7 @@ usage() { printf " %-25s%s\n" "-r, --remove" "Remove theme, remove all installed themes" printf " %-25s%s\n" "-o, --opacity VARIANTS" "Specify theme opacity variant(s) [standard|solid] (Default: All variants)" printf " %-25s%s\n" "-c, --color VARIANTS" "Specify theme color variant(s) [light|dark] (Default: All variants)" - printf " %-25s%s\n" "-a, --alt VARIANTS" "Specify theme titlebutton variant(s) [standard|alt] (Default: All variants)" + printf " %-25s%s\n" "-a, --alt VARIANTS" "Specify theme Window management (max/min/close) button variant(s) [standard|alt|all] (Default: All variants)" printf " %-25s%s\n" "-t, --theme VARIANTS" "Specify primary theme color [blue|purple|pink|red|orange|yellow|green|grey|all] (Default: MacOS blue)" printf " %-25s%s\n" "-p, --panel VARIANTS" "Change the panel transparency [25|35|45|55|65|75|85] (Default: 85%)" printf " %-25s%s\n" "-s, --size VARIANTS" "Change the nautilus sidebar width size [220|240|260|280] (Default: 200)" @@ -202,7 +202,7 @@ install() { install_theme() { for color in "${colors[@]-${COLOR_VARIANTS[@]}}"; do for opacity in "${opacities[@]-${OPACITY_VARIANTS[@]}}"; do - for alt in "${alts[@]-${ALT_VARIANTS[@]}}"; do + for alt in "${alts[@]-${ALT_VARIANTS[0]}}"; do for theme in "${themes[@]-${THEME_VARIANTS[0]}}"; do for icon in "${icons[@]-${ICON_VARIANTS[0]}}"; do for panel_opacity in "${panel_opacities[@]-${PANEL_OPACITY_VARIANTS[0]}}"; do @@ -233,7 +233,7 @@ remove_theme() { for color in "${colors[@]-${COLOR_VARIANTS[@]}}"; do for opacity in "${opacities[@]-${OPACITY_VARIANTS[@]}}"; do for alt in "${alts[@]-${ALT_VARIANTS[@]}}"; do - for theme in "${themes[@]-${THEME_VARIANTS[0]}}"; do + for theme in "${themes[@]-${THEME_VARIANTS[@]}}"; do [[ -d "${DEST_DIR}/${THEME_NAME}${color}${opacity}${alt}${theme}" ]] && rm -rf "${DEST_DIR}/${THEME_NAME}${color}${opacity}${alt}${theme}" done done @@ -514,11 +514,15 @@ while [[ $# -gt 0 ]]; do alts+=("${ALT_VARIANTS[1]}") shift ;; + all) + alts+=("${ALT_VARIANTS[@]}") + shift + ;; -*|--*) break ;; *) - prompt -e "ERROR: Unrecognized opacity variant '$1'." + prompt -e "ERROR: Unrecognized window button variant '$1'." prompt -i "Try '$0 --help' for more information." exit 1 ;;