linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-19 21:41:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(sublime-merge): add windows path for sublime merge

Browse source
This commit is contained in:
Eric Johnson 2022-04-16 13:09:18 -04:00
parent eb00b95d26
commit 8209567b3c
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/sublime-merge/sublime-merge.plugin.zsh
View file

@ -4,6 +4,11 @@
if [[ "$OSTYPE" == linux* ]]; then if [[ "$OSTYPE" == linux* ]]; then
local _sublime_linux_paths 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=( _sublime_linux_paths=(
"$HOME/bin/sublime_merge" "$HOME/bin/sublime_merge"
"/opt/sublime_merge/sublime_merge" "/opt/sublime_merge/sublime_merge"
@ -13,6 +18,7 @@
"/usr/local/bin/smerge" "/usr/local/bin/smerge"
"/usr/bin/smerge" "/usr/bin/smerge"
) )
fi
for _sublime_merge_path in $_sublime_linux_paths; do for _sublime_merge_path in $_sublime_linux_paths; do
if [[ -a $_sublime_merge_path ]]; then if [[ -a $_sublime_merge_path ]]; then
sm_run() { $_sublime_merge_path "$@" >/dev/null 2>&1 &| } sm_run() { $_sublime_merge_path "$@" >/dev/null 2>&1 &| }