From bfdcdf4a2485bd716c53a1ea44243da6ff461fc3 Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Fri, 24 May 2024 20:05:03 +0200 Subject: [PATCH] clean up formatting --- .local/bin/shortcuts | 49 +++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 33 deletions(-) diff --git a/.local/bin/shortcuts b/.local/bin/shortcuts index dafb3f535a..52b4087763 100755 --- a/.local/bin/shortcuts +++ b/.local/bin/shortcuts @@ -20,26 +20,19 @@ write_dirs() { path=$(eval "echo $path_raw") printf "%s=\"cd %s && ls -A\" \\\\\n" \ - "$shortcut" "$path" \ - >>"$shell_shortcuts" + "$shortcut" "$path" >>"$shell_shortcuts" printf "hash -d %s=%s\n" \ - "$shortcut" "$path" \ - >>"$zsh_named_dirs" + "$shortcut" "$path" >>"$zsh_named_dirs" printf "abbr %s \"cd %s; and ls -A\"\n" \ - "$shortcut" "$path" \ - >>"$fish_shortcuts" + "$shortcut" "$path" >>"$fish_shortcuts" printf "map g%s :cd %s\nmap t%s :cd %s\nmap M%s :cd %s:mo\nmap Y%s :cd %s:co \n" \ - "$shortcut" "$path" "$shortcut" "$path" "$shortcut" "$path" "$shortcut" "$path" \ - >>"$vifm_shortcuts" + "$shortcut" "$path" "$shortcut" "$path" "$shortcut" "$path" "$shortcut" "$path" >>"$vifm_shortcuts" printf "config.bind(';%s', \"set downloads.location.directory %s ;; hint links download\") \n" \ - "$shortcut" "$path" \ - >>"$qute_shortcuts" + "$shortcut" "$path" >>"$qute_shortcuts" printf "map C%s cd \"%s\"\n" \ - "$shortcut" "$path" \ - >>"$lf_shortcuts" + "$shortcut" "$path" >>"$lf_shortcuts" printf "cmap ;%s %s\n" \ - "$shortcut" "$path" \ - >>"$vim_shortcuts" + "$shortcut" "$path" >>"$vim_shortcuts" done } @@ -50,36 +43,26 @@ write_files() { path=$(eval "echo $path_raw") printf "%s=\"\$EDITOR %s\" \\\\\n" \ - "$shortcut" "$path" \ - >>"$shell_shortcuts" + "$shortcut" "$path" >>"$shell_shortcuts" printf "hash -d %s=%s \n" \ - "$shortcut" "$path" \ - >>"$zsh_named_dirs" + "$shortcut" "$path" >>"$zsh_named_dirs" printf "abbr %s \"\$EDITOR %s\" \n" \ - "$shortcut" "$path" \ - >>"$fish_shortcuts" + "$shortcut" "$path" >>"$fish_shortcuts" printf "map %s :e %s \n" \ - "$shortcut" "$path" \ - >>"$vifm_shortcuts" + "$shortcut" "$path" >>"$vifm_shortcuts" printf "map E%s \$\$EDITOR \"%s\" \n" \ - "$shortcut" "$path" \ - >>"$lf_shortcuts" + "$shortcut" "$path" >>"$lf_shortcuts" printf "cmap ;%s %s\n" \ - "$shortcut" "$path" \ - >>"$vim_shortcuts" + "$shortcut" "$path" >>"$vim_shortcuts" done } -filter() { - input=$1 - sed 's/#.*//;/^$/d;s/ \+/ /g' "$input" -} - # Remove, prepare files rm -f "$lf_shortcuts" "$qute_shortcuts" "$zsh_named_dirs" "$vim_shortcuts" 2>/dev/null printf "# vim: filetype=sh\\n" >"$fish_shortcuts" printf "# vim: filetype=sh\\nalias " >"$shell_shortcuts" printf "\" vim: filetype=vim\\n" >"$vifm_shortcuts" -filter "$bmdirs" | write_dirs -filter "$bmfiles" | write_files +# Write shortcuts to files +sed 's/#.*//;/^$/d;s/ \+/ /g' <"$bmdirs" | write_dirs +sed 's/#.*//;/^$/d;s/ \+/ /g' <"$bmfiles" | write_files