mirrors/papirus-folders
1
0
Fork 0
mirror of https://github.com/PapirusDevelopmentTeam/papirus-folders.git synced 2024-09-19 19:18:49 -04:00
Code Issues Projects Releases Packages Wiki Activity

Minor fixes

Browse source
This commit is contained in:
Sergei Eremenko 2018-09-09 11:32:25 +03:00
parent df7208c2bc
commit f124772180
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
completion/_papirus-folders
View file

@ -5,9 +5,9 @@
# @link: https://github.com/PapirusDevelopmentTeam/papirus-folders # @link: https://github.com/PapirusDevelopmentTeam/papirus-folders
_get_colors() { _get_colors() {
local -a valid_colors=(black blue bluegrey brown cyan green grey local -a colors=(black blue bluegrey brown cyan green grey
magenta orange pink purple red teal violet yellow) magenta orange pink purple red teal violet yellow)
_wanted colors exlp 'color' compadd -- "${valid_colors[@]}" _wanted colors exlp 'color' compadd -- "${colors[@]}"
return 0 return 0
} }

4
completion/papirus-folders
View file

@ -32,7 +32,7 @@ __get_themes() {
_papirus_folders() { _papirus_folders() {
local cur prev local cur prev
local -a valid_colors=(black blue bluegrey brown cyan green grey local -a colors=(black blue bluegrey brown cyan green grey
magenta orange pink purple red teal violet yellow) magenta orange pink purple red teal violet yellow)
local -a opts=( local -a opts=(
-h --help -h --help
@ -50,7 +50,7 @@ _papirus_folders() {
case "$prev" in case "$prev" in
-C|--color) -C|--color)
COMPREPLY=( $(compgen -W "${valid_colors[*]}" -- "${cur}") ) COMPREPLY=( $(compgen -W "${colors[*]}" -- "${cur}") )
return return
;; ;;
-t|--theme) -t|--theme)

8
papirus-folders
View file

@ -144,8 +144,7 @@ get_theme_dir() {
# Get data directories from XDG_DATA_DIRS variable and # Get data directories from XDG_DATA_DIRS variable and
# convert colon-separated list into bash array # convert colon-separated list into bash array
IFS=: read -ra data_dirs <<< \ IFS=: read -ra data_dirs <<< "${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
"${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
for data_dir in "${data_dirs[@]}"; do for data_dir in "${data_dirs[@]}"; do
[ -d "$data_dir/icons" ] || continue [ -d "$data_dir/icons" ] || continue
@ -155,6 +154,7 @@ get_theme_dir() {
for icons_dir in "${icons_dirs[@]}"; do for icons_dir in "${icons_dirs[@]}"; do
[ -f "$icons_dir/$THEME_NAME/index.theme" ] || continue [ -f "$icons_dir/$THEME_NAME/index.theme" ] || continue
printf '%s' "$icons_dir/$THEME_NAME" printf '%s' "$icons_dir/$THEME_NAME"
verbose "'$THEME_NAME' is found in '$icons_dir'."
return 0 return 0
done done
@ -398,7 +398,7 @@ parse_args() {
done done
# Reset the positional parameters to the short options # Reset the positional parameters to the short options
eval set -- "${args[@]}" set -- "${args[@]}"
while getopts ":C:DRlt:uvVh" opt; do while getopts ":C:DRlt:uvVh" opt; do
case "$opt" in case "$opt" in
@ -460,8 +460,6 @@ main() {
THEME_DIR="$(get_theme_dir)" \ THEME_DIR="$(get_theme_dir)" \
|| fatal "fail to find '$THEME_NAME' icon theme." || fatal "fail to find '$THEME_NAME' icon theme."
verbose "'$THEME_NAME' is found in '${THEME_DIR%/*}'."
case "$OPERATION" in case "$OPERATION" in
change-color) do_change_color ;; change-color) do_change_color ;;
revert-default) do_revert_default ;; revert-default) do_revert_default ;;