From 78e7045b6e0a038d472aa3fe5b60d62b66b645e2 Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Fri, 12 Apr 2024 12:02:41 +0200 Subject: [PATCH 1/3] shortcuts script refactor Unfortunately I don't have the time to test if every one of these generated configurations work, but they shouldn't have changed at all. --- .local/bin/shortcuts | 107 ++++++++++++++++++++++++++++++++----------- 1 file changed, 81 insertions(+), 26 deletions(-) diff --git a/.local/bin/shortcuts b/.local/bin/shortcuts index 7d7a1904d2..64990caeaa 100755 --- a/.local/bin/shortcuts +++ b/.local/bin/shortcuts @@ -1,5 +1,6 @@ #!/bin/sh +# Input locations. bmdirs="${XDG_CONFIG_HOME:-$HOME/.config}/shell/bm-dirs" bmfiles="${XDG_CONFIG_HOME:-$HOME/.config}/shell/bm-files" @@ -13,31 +14,85 @@ qute_shortcuts="/dev/null" fish_shortcuts="/dev/null" vifm_shortcuts="/dev/null" +write_dirs() { + while IFS= read -r line; do + shortcut=$(echo "$line" | cut -d' ' -f1) + path_raw=$(echo "$line" | cut -d' ' -f2) + path=$(eval "echo $path_raw") + + printf "%s=\"cd %s && ls -A\" \\\\\n" \ + "$shortcut" "$path" \ + >>"$shell_shortcuts" + printf "hash -d %s=%s\n" \ + "$shortcut" "$path" \ + >>"$zsh_named_dirs" + printf "abbr %s \"cd %s; and ls -A\"\n" \ + "$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" + printf "config.bind(';%s', \"set downloads.location.directory %s ;; hint links download\") \n" \ + "$shortcut" "$path" \ + >>"$qute_shortcuts" + printf "map g%s cd %s\nmap t%s tab_new %s\nmap m%s shell mv -v %%s %s\nmap Y%s shell cp -rv %%s %s \n" \ + "$shortcut" "$path" \ + "$shortcut" "$path" \ + "$shortcut" "$path" \ + "$shortcut" "$path" \ + >>"$ranger_shortcuts" + printf "map C%s cd \"%s\"\n" \ + "$shortcut" "$path" \ + >>"$lf_shortcuts" + printf "cmap ;%s %s\n" \ + "$shortcut" "$path" \ + >>"$vim_shortcuts" + done +} + +write_files() { + while IFS= read -r line; do + shortcut=$(echo "$line" | cut -d' ' -f1) + path_raw=$(echo "$line" | cut -d' ' -f2) + path=$(eval "echo $path_raw") + + printf "%s=\"\$EDITOR %s\" \\\\\n" \ + "$shortcut" "$path" \ + >>"$shell_shortcuts" + printf "hash -d %s=%s \n" \ + "$shortcut" "$path" \ + >>"$zsh_named_dirs" + printf "abbr %s \"\$EDITOR %s\" \n" \ + "$shortcut" "$path" \ + >>"$fish_shortcuts" + printf "map %s :e %s \n" \ + "$shortcut" "$path" \ + >>"$vifm_shortcuts" + printf "map %s shell \$EDITOR %s \n" \ + "$shortcut" "$path" \ + >>"$ranger_shortcuts" + printf "map E%s \$\$EDITOR \"%s\" \n" \ + "$shortcut" "$path" \ + >>"$lf_shortcuts" + printf "cmap ;%s %s\n" \ + "$shortcut" "$path" \ + >>"$vim_shortcuts" + done +} + +filter() { + input=$1 + sed 's/#.*//;/^$/d;s/ \+/ /g' "$input" +} + # Remove, prepare files rm -f "$lf_shortcuts" "$ranger_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" - -# Format the `directories` file in the correct syntax and sent it to all three configs. -eval "echo \"$(cat "$bmdirs")\"" | \ -awk "!/^\s*#/ && !/^\s*\$/ {gsub(\"\\\s*#.*$\",\"\"); - printf(\"%s=\42cd %s && ls -A\42 \\\\\n\",\$1,\$2) >> \"$shell_shortcuts\" ; - printf(\"hash -d %s=%s \n\",\$1,\$2) >> \"$zsh_named_dirs\" ; - printf(\"abbr %s \42cd %s; and ls -A\42\n\",\$1,\$2) >> \"$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\",\$1,\$2, \$1, \$2, \$1, \$2, \$1, \$2) >> \"$vifm_shortcuts\" ; - printf(\"config.bind(';%s', \42set downloads.location.directory %s ;; hint links download\42) \n\",\$1,\$2) >> \"$qute_shortcuts\" ; - printf(\"map g%s cd %s\nmap t%s tab_new %s\nmap m%s shell mv -v %%s %s\nmap Y%s shell cp -rv %%s %s \n\",\$1,\$2,\$1,\$2, \$1, \$2, \$1, \$2) >> \"$ranger_shortcuts\" ; - printf(\"map C%s cd \42%s\42 \n\",\$1,\$2) >> \"$lf_shortcuts\" ; - printf(\"cmap ;%s %s\n\",\$1,\$2) >> \"$vim_shortcuts\" }" - -# Format the `files` file in the correct syntax and sent it to both configs. -eval "echo \"$(cat "$bmfiles")\"" | \ -awk "!/^\s*#/ && !/^\s*\$/ {gsub(\"\\\s*#.*$\",\"\"); - printf(\"%s=\42\$EDITOR %s\42 \\\\\n\",\$1,\$2) >> \"$shell_shortcuts\" ; - printf(\"hash -d %s=%s \n\",\$1,\$2) >> \"$zsh_named_dirs\" ; - printf(\"abbr %s \42\$EDITOR %s\42 \n\",\$1,\$2) >> \"$fish_shortcuts\" ; - printf(\"map %s :e %s \n\",\$1,\$2) >> \"$vifm_shortcuts\" ; - printf(\"map %s shell \$EDITOR %s \n\",\$1,\$2) >> \"$ranger_shortcuts\" ; - printf(\"map E%s \$\$EDITOR \42%s\42 \n\",\$1,\$2) >> \"$lf_shortcuts\" ; - printf(\"cmap ;%s %s\n\",\$1,\$2) >> \"$vim_shortcuts\" }" +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 From bb1dc77798ac77ca31877940dc50c54c6d745be2 Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Fri, 24 May 2024 19:53:15 +0200 Subject: [PATCH 2/3] port upstream changes https://github.com/LukeSmithxyz/voidrice/pull/1385 --- .local/bin/shortcuts | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.local/bin/shortcuts b/.local/bin/shortcuts index 64990caeaa..826e2169d2 100755 --- a/.local/bin/shortcuts +++ b/.local/bin/shortcuts @@ -9,7 +9,6 @@ shell_shortcuts="${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc" zsh_named_dirs="${XDG_CONFIG_HOME:-$HOME/.config}/shell/zshnameddirrc" lf_shortcuts="${XDG_CONFIG_HOME:-$HOME/.config}/lf/shortcutrc" vim_shortcuts="${XDG_CONFIG_HOME:-$HOME/.config}/nvim/shortcuts.vim" -ranger_shortcuts="/dev/null" qute_shortcuts="/dev/null" fish_shortcuts="/dev/null" vifm_shortcuts="/dev/null" @@ -38,12 +37,6 @@ write_dirs() { printf "config.bind(';%s', \"set downloads.location.directory %s ;; hint links download\") \n" \ "$shortcut" "$path" \ >>"$qute_shortcuts" - printf "map g%s cd %s\nmap t%s tab_new %s\nmap m%s shell mv -v %%s %s\nmap Y%s shell cp -rv %%s %s \n" \ - "$shortcut" "$path" \ - "$shortcut" "$path" \ - "$shortcut" "$path" \ - "$shortcut" "$path" \ - >>"$ranger_shortcuts" printf "map C%s cd \"%s\"\n" \ "$shortcut" "$path" \ >>"$lf_shortcuts" @@ -71,9 +64,6 @@ write_files() { printf "map %s :e %s \n" \ "$shortcut" "$path" \ >>"$vifm_shortcuts" - printf "map %s shell \$EDITOR %s \n" \ - "$shortcut" "$path" \ - >>"$ranger_shortcuts" printf "map E%s \$\$EDITOR \"%s\" \n" \ "$shortcut" "$path" \ >>"$lf_shortcuts" @@ -89,7 +79,7 @@ filter() { } # Remove, prepare files -rm -f "$lf_shortcuts" "$ranger_shortcuts" "$qute_shortcuts" "$zsh_named_dirs" "$vim_shortcuts" 2>/dev/null +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" From 2e22448e88bc4e23a6e9137dd17e6e2667fc2e10 Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Fri, 24 May 2024 20:01:07 +0200 Subject: [PATCH 3/3] clean up formatting --- .local/bin/shortcuts | 52 ++++++++++++++------------------------------ 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/.local/bin/shortcuts b/.local/bin/shortcuts index 826e2169d2..52b4087763 100755 --- a/.local/bin/shortcuts +++ b/.local/bin/shortcuts @@ -20,29 +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 } @@ -53,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