| Revision | 8a98d0af4f4ff5e5ea505b20041ee1e36172eed5 (tree) |
|---|---|
| Zeit | 2021-05-05 22:16:09 |
| Autor | hayao <hayao@fasc...> |
| Commiter | hayao |
[fix] : Fixed SC2267
| @@ -211,7 +211,7 @@ get_cursor_theme(){ | ||
| 211 | 211 | if [[ -d "${_dir}" ]]; then |
| 212 | 212 | while read -r line; do |
| 213 | 213 | _cursor_theme_dir_list+=("${line}") |
| 214 | - done < <(find "${_dir}" -type d -name "cursors" -print0 | xargs -0 -i dirname {} | sort) | |
| 214 | + done < <(find "${_dir}" -type d -name "cursors" -print0 | xargs -0 -I{} dirname {} | sort) | |
| 215 | 215 | fi |
| 216 | 216 | done |
| 217 | 217 | unset _dir _find_cursor_dir_list |
| @@ -235,7 +235,7 @@ get_gtk_theme(){ | ||
| 235 | 235 | if [[ -d "${_dir}" ]]; then |
| 236 | 236 | while read -r line; do |
| 237 | 237 | _gtk_theme_dir_list+=("${line}") |
| 238 | - done < <(find "${_dir}" -type d -name "gtk-*" -print0 | xargs -0 -i dirname {} | tr " " "\n" | sort | uniq) | |
| 238 | + done < <(find "${_dir}" -type d -name "gtk-*" -print0 | xargs -0 -I{} dirname {} | tr " " "\n" | sort | uniq) | |
| 239 | 239 | fi |
| 240 | 240 | done |
| 241 | 241 |
| @@ -259,7 +259,7 @@ get_icon_theme(){ | ||
| 259 | 259 | if [[ -d "${_dir}" ]]; then |
| 260 | 260 | while read -r line; do |
| 261 | 261 | _icon_theme_dir_list+=("${line}") |
| 262 | - done < <(find "${_dir}" -type f -name "index.theme" -print0 | xargs -0 -i dirname {} | tr " " "\n" | sort | uniq) | |
| 262 | + done < <(find "${_dir}" -type f -name "index.theme" -print0 | xargs -0 -I{} dirname {} | tr " " "\n" | sort | uniq) | |
| 263 | 263 | fi |
| 264 | 264 | done |
| 265 | 265 |
| @@ -363,9 +363,7 @@ ask_session(){ | ||
| 363 | 363 | exit 1 |
| 364 | 364 | fi |
| 365 | 365 | else |
| 366 | - while read -r line; do | |
| 367 | - _session_list+=("${line}") | |
| 368 | - done < <(get_xorg_session) | |
| 366 | + readarray -t _session_list < <(get_xorg_session) | |
| 369 | 367 | if ! session="$(ask_question -p "Select the desktop session to autologin" "${_session_list[@]}")"; then |
| 370 | 368 | msg_error "Please enter the correct session name." |
| 371 | 369 | exit 1 |
| @@ -383,7 +381,7 @@ ask_session(){ | ||
| 383 | 381 | # GTKテーマを聞く |
| 384 | 382 | ask_gtk_theme(){ |
| 385 | 383 | local gtk_themes _theme |
| 386 | - while read -r line; do gtk_themes+=("${line}"); done < <(get_gtk_theme) | |
| 384 | + readarray -t gtk_themes < <(get_gtk_theme) | |
| 387 | 385 | |
| 388 | 386 | # 質問する |
| 389 | 387 | if ! _theme="$(ask_question -p "Please select the theme to use" "${gtk_themes[@]}")"; then |
| @@ -612,7 +610,7 @@ lightdm_get_value(){ | ||
| 612 | 610 | |
| 613 | 611 | lightdm_greeter_list(){ |
| 614 | 612 | local greeter_list |
| 615 | - readarray -t greeter_list < <( (find "${LIGHTDM_GREETERS_DIR}" -print0 -type f | xargs -0 -i basename {} | grep -E ".desktop$" | sed "s|.desktop$||g" | grep -xv "xgreeters") 2> /dev/null ) | |
| 613 | + readarray -t greeter_list < <( (find "${LIGHTDM_GREETERS_DIR}" -print0 -type f | xargs -0 -I{} basename {} | grep -E ".desktop$" | sed "s|.desktop$||g" | grep -xv "xgreeters") 2> /dev/null ) | |
| 616 | 614 | printf "%s\n" "${greeter_list[@]}" | sort | uniq |
| 617 | 615 | } |
| 618 | 616 |
| @@ -830,7 +828,7 @@ gdm_dconf_set_config(){ | ||
| 830 | 828 | |
| 831 | 829 | # gdm_dconf_get_value <dconf path> <key> |
| 832 | 830 | gdm_dconf_get_value(){ |
| 833 | - find "/etc/dconf/db/gdm.d/" -type f -print0 | xargs -0i cat {} | crudini --get - "${1}" "${2}" | sed "s|^[\"\']||g" | sed "s|[\"\']$||g" | |
| 831 | + find "/etc/dconf/db/gdm.d/" -type f -print0 | xargs -0 -I{} cat {} | crudini --get - "${1}" "${2}" | sed "s|^[\"\']||g" | sed "s|[\"\']$||g" | |
| 834 | 832 | } |
| 835 | 833 | |
| 836 | 834 | # gdm_custom_get_value <section> <key> |
Fork
dmc