1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-10-16 11:40:46 +00:00

Compare commits

...

2 commits

Author SHA1 Message Date
Eric Johnson
c00ddff5c4
Merge 8209567b3c into 47767bd03c 2024-08-12 02:32:25 -04:00
Eric Johnson
8209567b3c feat(sublime-merge): add windows path for sublime merge 2022-04-16 13:19:53 -04:00

View file

@ -4,6 +4,11 @@
if [[ "$OSTYPE" == linux* ]]; then
local _sublime_linux_paths
if [[ "$(uname -r)" = *icrosoft* ]]; then
_sublime_linux_paths=(
"$(wslpath -u 'C:\Program Files\Sublime Merge\sublime_merge.exe' 2>/dev/null)"
)
else
_sublime_linux_paths=(
"$HOME/bin/sublime_merge"
"/opt/sublime_merge/sublime_merge"
@ -13,6 +18,7 @@
"/usr/local/bin/smerge"
"/usr/bin/smerge"
)
fi
for _sublime_merge_path in $_sublime_linux_paths; do
if [[ -a $_sublime_merge_path ]]; then
sm_run() { $_sublime_merge_path "$@" >/dev/null 2>&1 &| }