Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Sublime plugin should check more locations #1841

Closed
wants to merge 1 commit into from

3 participants

@tsalzer

On OSX, the sublime plugin checks for various possible locations of the
Sublime Text application; on Linux, however, only two spots are covered.
This change uses the same detection mechanism used for OSX for Linux
systems to check for the typical install locations:

$HOME/bin/sublime_text
/usr/local/bin/sublime_text
/usr/bin/sublime_text

This allows non-root users on Linux systems to use the plugin without
hassle.

@kevinxucs kevinxucs referenced this pull request from a commit in kevinxucs/oh-my-zsh
@kevinxucs kevinxucs Integrate changes from #1841. 2691520
@bwl bwl referenced this pull request from a commit in bwl/oh-my-zsh
@kevinxucs kevinxucs Integrate changes from #1841. 9a78aab
@glasslion

@tsalzer @kevinxucs This commit breaks the sublime plugin on Ubuntu 13.10

sublime.plugin.zsh: 5: sublime.plugin.zsh: Syntax error: "(" unexpected (expecting "fi")
@kevinxucs

@glasslion Which commit you are referring to? #1841 or mine #2572?

@kevinxucs

#1841 isn't merged yet. Which version of zsh you are using? I have tested mine #2572 on

  1. Debian Jessie (zsh 5.0.5)
  2. Ubuntu 12.04.4 (zsh 4.3.17)
  3. OS X 10.9.2 (zsh 5.0.2)

All of them work perfectly fine.

@glasslion

@kevinxucs My sublime was installed at /usr/bin/sublime-text. That path is removed in #2572 and #1841

@kevinxucs

@glasslion

mkdir -p $HOME/bin && ln -s /usr/bin/sublime-text $HOME/bin/sublime_text
@noj noj referenced this pull request from a commit in noj/oh-my-zsh
@noj noj Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
* 'master' of https://github.com/robbyrussell/oh-my-zsh: (51 commits)
  Updated wd plugin to v0.3.0
  Integrate changes from #1841.
  Fixed sublime plugin behaviors.
  :panda_face: Added simulator alias for Xcode plugin
  gem push alias and gem yank alias
  add gem push alias
  add gem build alias
  Verification of convert inside the function
  grab last item in list which is the branch instead of relying on position.
  Much needed PEP8 love. Use spaces, not tabs.
  Avoid 'title:parse error' with single quotes in $CMD Fixes #2182
  Revert previous commit, escape %
  Use single quotes also in $LINE definiton
  Avoid evaluating special chars in $LINE on title command (fixes #2234)
  Added Yii basic command completion
  Improve oneline logs
  update golang plugin to match official version
  remove duplicate 'go' plugin, symlink to 'golang'
  highlight the username when root
  theme agnoster: remove trailing space
  ...
cbf403c
@smt smt referenced this pull request from a commit in smt/oh-my-zsh
@smt smt Merge remote-tracking branch 'upstream/master'
* upstream/master: (51 commits)
  Updated wd plugin to v0.3.0
  Integrate changes from #1841.
  Fixed sublime plugin behaviors.
  :panda_face: Added simulator alias for Xcode plugin
  gem push alias and gem yank alias
  add gem push alias
  add gem build alias
  Verification of convert inside the function
  grab last item in list which is the branch instead of relying on position.
  Much needed PEP8 love. Use spaces, not tabs.
  Avoid 'title:parse error' with single quotes in $CMD Fixes #2182
  Revert previous commit, escape %
  Use single quotes also in $LINE definiton
  Avoid evaluating special chars in $LINE on title command (fixes #2234)
  Added Yii basic command completion
  Improve oneline logs
  update golang plugin to match official version
  remove duplicate 'go' plugin, symlink to 'golang'
  highlight the username when root
  theme agnoster: remove trailing space
  ...
b79e2fd
@tsalzer

@glasslion Sorry to be late. #1841 is tested on Ubuntu 12.04 (not sure about OSX, as I don't recall using the plugin there). No syntax errors here, but, yes, it accidentally removed "/usr/bin/sublime-text". I will rebase my branch and fix that later today or tomorrow.

BTW: Thanks @kevinxucs! :)

@tsalzer tsalzer Sublime plugin should check more locations
On OSX, the sublime plugin checks for various possible locations of the
Sublime Text application; on Linux, however, only two spots are covered.
This change uses the same detection mechanism used for OSX for Linux
systems to check for the typical install locations:

    $HOME/bin/sublime_text
    /usr/local/bin/sublime_text
    /usr/bin/sublime_text

This allows non-root users on Linux systems to use the plugin without
hassle.
61ce221
@tsalzer

@glasslion Rebased, added two more lines with the "sublime-text" variation.

However, it just gets messy if I add more possible paths, and #2572 does the job very well. I'm experimenting, just for fun, with a better way to iterate over possible locations and binary names, but since Sublime Text comes with the "subl" command line, all that's left for the plugin is to try to beat PATH at being PATH. :)

@tsalzer tsalzer closed this
@Xuyuanp Xuyuanp referenced this pull request from a commit in Xuyuanp/oh-my-zsh
@Xuyuanp Xuyuanp Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
* 'master' of https://github.com/robbyrussell/oh-my-zsh: (94 commits)
  Fixing a few quirks in the latest installer updates (quoting /Users/robbyrussell/.oh-my-zsh and such). Also mentioining our twitter account after install
  Update license year
  Updating README to show the new install URL, which redirects to the raw files on github.
  Fixes #2467 tab completion scrolls back in terminal when using bureau theme
  Add github url shortener
  Fix typo in autocomplete arguments
  Removed unsolicited aliases.
  Fix hgsl alias.
  Document alternate install paths via ZSH variable
  Abort installer on errors
  Write install path into .zshrc
  Reference default install path from ZSH variable
  Remove all copyright information in themes. Closes #2587
  added mvnjetty alias
  added aliases for tomcat:run tomcat7:run
  added mvn-update
  Updated wd plugin to v0.3.0
  Integrate changes from #1841.
  Fixed sublime plugin behaviors.
  :panda_face: Added simulator alias for Xcode plugin
  ...
02c1e02
@lesterchan lesterchan referenced this pull request from a commit in lesterchan/oh-my-zsh
@lesterchan lesterchan Merge remote-tracking branch 'upstream/master'
* upstream/master: (102 commits)
  Fixing a few quirks in the latest installer updates (quoting /Users/robbyrussell/.oh-my-zsh and such). Also mentioining our twitter account after install
  Update license year
  Updating README to show the new install URL, which redirects to the raw files on github.
  Fixes #2467 tab completion scrolls back in terminal when using bureau theme
  Add github url shortener
  Fix typo in autocomplete arguments
  Removed unsolicited aliases.
  Fix hgsl alias.
  Document alternate install paths via ZSH variable
  Abort installer on errors
  Write install path into .zshrc
  Reference default install path from ZSH variable
  Remove all copyright information in themes. Closes #2587
  added mvnjetty alias
  added aliases for tomcat:run tomcat7:run
  added mvn-update
  Updated wd plugin to v0.3.0
  Integrate changes from #1841.
  Fixed sublime plugin behaviors.
  :panda_face: Added simulator alias for Xcode plugin
  ...

Conflicts:
	README.textile
	tools/install.sh
11fe396
@neiljdo neiljdo referenced this pull request from a commit in neiljdo/oh-my-zsh
@kevinxucs kevinxucs Integrate changes from #1841. 66a4687
@w31 w31 referenced this pull request from a commit in w31/oh-my-zsh
@kevinxucs kevinxucs Integrate changes from #1841. 6f3c3cf
@stvleung stvleung referenced this pull request from a commit
@kevinxucs kevinxucs Integrate changes from #1841. 1b70194
@bobtwinkles bobtwinkles referenced this pull request from a commit in bobtwinkles/oh-my-zsh
@kevinxucs kevinxucs Integrate changes from #1841. b5f854b
@arowla arowla referenced this pull request from a commit in arowla/oh-my-zsh
@kevinxucs kevinxucs Integrate changes from #1841. 700ace4
@torbjoernk torbjoernk referenced this pull request from a commit in torbjoernk/oh-my-zsh
root Merge remote-tracking branch 'upstream/master'
* upstream/master:
  Don't set auto_name_dirs because it messes up prompts
  Revert "Exit early from git plugin if not in git repo."
  Support dynamically defined Vagrant machines
  Symfony2 plugin autocomplete for app/console and bin/console
  Symfony2 plugin look for files only
  Symfony2 plugin use first console found
  Revert "Add Composer's local binaries to PATH"
  Revert "Add a CONTRIBUTING file to instruct people on issues and pull requests"
  add wp-cli plugin readme
  add git difftool alias (gdt)
  fix missing add-zsh-hook in pygmalion.zsh-theme
  Use the library function for ruby prompt
  Improve support for Vagrant VM definitions
  Add README.md for adb-autocompletion plugin.
  Link to swag in installer... shameless profiting
  Adding link to the store for swag in upgrade process
  Adding README.md and renaming plugin
  Adding README.md
  Adding README.md
  Add Composer's local binaries to PATH
  Amended to source the original aws_zsh_completer.sh rather than the mangled version installed into $(brew-prefix)/bin if using homebrew installed awscli on OSX.
  tmuxinator completion update: Current completion plugin isn't up to date and #2075 PR, which is also the completion plugin on the official tmuxinator repository, doesn't work. Thus this should do the trick for the moment. Also suppressed an error when no completion is available
  Fix pass zsh completion and autoloading
  Update pass completion to upstream
  Added a link to the file's license and added the commiter as plugin maintaner.
  Categories of issues in oh-my-zsh (work-in-progress)
  Add CONTRIBUTING.md file general structure
  Adding quotes around $1
  Adding quotes around $1
  Adding quotes around $1
  Adding Textastic plugin
  Adding Marked 2 plugin
  Adding BBEdit plugin
  Added 'uninstall' command to brew completion
  This alias is conflict cause
  Fix missing add-zsh-hook
  #git plugin git diff-tree --name-only added
  Don't try running chsh if user already runs zsh
  Replace /usr/bin/env with env
  Resets the font colour to original
  Update jira plugin to allow lookup of issues
  New alias for git plugin: gbr == git branch --remote
  Inclusion of aliases for sign git commits and tags
  rounding to emoji clock
  bugfix: two wild apostrophes
  Add support for local aur databases
  Added _files to complete all arguments following the first as files
  Added autocompleting plugin for Android Debug Bridge (adb).
  Update half-life.zsh-theme
  Update README.textile
  Add gap (git add --patch)
  TomEE maven plugin + integration-test in common life-cycle
  WP-CLI plugin init
  Update rvm.plugin.zsh
  Update README.textile
  Update README.textile
  Run Web-search as a Background Process with Nohup
  Use $OSTYPE instead of uname to speed things up
  Trust but verify 'scutil' to return ComputerName
  Update brew.plugin.zsh
  #2914 fixed symfony2 autocomplete
  gem plugin: added _files to install command
  make sure cache dir exists, just like log dir
  Revert "specify python2 in shebang"
  [wd] v0.2.2: Added MIT-License
  [wd] v0.3.1: Improved completion and bug fixes
  add BUNDLED_COMMANDS functionality to bundler plugin
  added Bundler readme file
  add pry to bundler-commands
  add spring to bundler-commands
  remove double bundle exec
  Add 'outdated' and 'platform' completions to bundler plugin
  remove berkshelf from bundler-commands
  remove ruby from bundler-commands
  remove spin from bundler-commands
  remove foreman from bundler-commands
  add sidekiq to bundler-commands
  split bundler-commands into seperate lines
  Add support for jira-prefix configuration file
  Fix typo in warp directory plugin
  added cache:warmup alias
  Fix typo in docker plugin
  terminal party show exit status with color
  Spring boot autocomplete
  #2893 generalized symfony2 console directory
  Make bundler plugin run binstubbed cmd if existing
  Basic support for Docker related commands.
  Add Composer's global binaries to PATH
  Add /usr/bin/subl path for who has linked sublime text there
  Plugin jump: autocompletion for numbers and dots
  added useful mvn aliases
  Add spring to bundled commands
  git_prompt_info: ignore git-config errors
  Add missing `command` wrapper for git
  Add missing quotes to within-bundler-project function
  Add pip2 and pip-2.7 support to pip plugin
  Add pip3 completion support to pip plugin
  Add new plugin: "frontend-search"
  ignore usernames beginning with underscore
  return 0 when not a git repo before, 128 was returned, which could display an error, but out of a git repo this should exit silently fixes #2226
  fix root mode not working in bureau
  Autojump plugin: check user local installation first.
  Vundle plugin now works with submodules.
  fixed rvm warning
  New alias for repo: ru and rst
  Add startproject to django command completions
  Adding compression to rsync commands
  Add a command to show unresolve files in merge
  Don't override ZSH_COMPDUMP if already set.
  Show user prompt in gnzh theme regardless of UID
  Cancel upgrade if $ZSH is not writable from #2360
  Add alias for container:debug task
  specify python2 in shebang as suggested in #2382
  too many plugins = slow init warning
  use ls instead of find to avoid incompatibility with gnu find
  Fix comparison used to determine if the cache is outdated.
  add gfa alias for recursive formatting inspired from #2018
  Fix permissions on wd plugin continuating #1923
  Removed unnecessary execute permissions for some plugins
  Update colorize.plugin.zsh
  Correct wrong plugin file name
  Fix path for colemak plugin
  Steeef theme checks untracked files instead of directories
  Update plugins/rbenv/rbenv.plugin.zsh
  Corrected syntax error in github plugin's empty_gh function
  Adds itunes vol command.
  extract plugin will unzip *.sublime-package files
  added prefix/suffix variable for customizability
  Move aliases to 'custom' section of .zshrc template
  added new function to get number of commits ahead of remote
  replaced hardcoded origin/{branch-name} with @{upstream} which gets the upstream branch since git 1.7.0
  Fix function/alias naming clash between bower and bundle plugin
  Ordering nocorrect aliases alphabetically
  Defining nocorrect aliases only when ENABLE_CORRECTION is "true"
  Replacing DISABLE_CORRECTION with ENABLE_CORRECTION in zshrc template
  fix(tools/check_for_upgrade): Don't source profile
  Fix dud alias. Switch --max-depth for just -d
  This is already done in lib/theme-and-appearance.zsh and supports Darwin/BSD/etc
  Write the update file even if `CLOBBER` is unset.
  Fixing typo.
  Minor markup edits
  typo, fixes #1806
  Improve consistency, remove dots at end of command descriptions
  [FEATURE] Support vagrant global-status
  [FEATURE] Support Vagrant Cloud commands
  [FEATURE] Support Vagrant Share
  [FEATURE] Support Vagrant 1.6 version command
  Update brew.plugin.zsh
  Fix `docker rmi` tab completion
  Fix for Python3
  set exclude-dir or exclude grep flags only if available
  Use cache folder inside $ZSH, delete with unaliased rm
  Spelling correction in itunes control function.
  Remove mailcatcher
  Correct redirection of output from 'hash'
  Add Ruby 2.1.1 support to rvm plugin
  adding urldecode_json to compliment urlencode_json and updating readme.md; slight tweak to urlencode_json from previous commit
  adding urlencode_json and associated README.md details
  Added git mode support for merging, rebasing, and bisecting
  Matching autocomplete for Docker v0.9.1
  Fix broken reverse-menu-complete keybinding.
  adding the is_json tool and associated readme.md details
  Escape % in $CMD variable
  Add README file to rake-fast plugin
  Allowing path with spaces in pow plugin
  brew-cask plugin: use spaces instead of tabs
  New aliases for 'apt-get' and 'aptitude' as they were overwritten by later aliases
  adding support for node
  Adds command line aliases useful for dealing with JSON
  Updates spectrum.zsh
  $ZSH is the OMZ installation folder, not configuration
  mention $ZSH_CUSTOM as suggested in #2295
  suggest setting $LANG to fix #1286 and fix #1823
  Fix export syntax of $GREP_OPTIONS
  Rendering the 'vagrant box (remove|repackage)' completion code independant of Vagrant implementation details.
  application completion
  library completion
  in hindsight, this is probably a bad idea
  completion of targets
  instance and cluster completion
  node completion
  help command, node completion
  added _files values for certain options
  completion options
  added alias
  added completions for all known arguments to all known commands
  apparently, this file must exist for the plugin to load
  added completion for all asadmin subcommands
  avoid VCS folders
  Move example plugin to the custom plugins dir.
  Add completion for pip install -r - so that it autocompletes requirements filenames
  Added an <esc> to the begining of everything. I ran something when I was in insert mode once and all it did was shove !args... into the buffer.  <esc> first.
  Updated the README to include documentation on the postCallVim callout
  Added an optional callout to the end of the interaction function. I put it in to allow me to put the window focus on MacVim / GVim depending on the different OS I happen to be on
  Fixed: If you callvim on a non-existant file with a relative path, the CWD of the running gvim process is used, and that's not right.  We use the PWD explicitly instead, in this case
  A plugin that makes it easier to interact with the (single) running instance of gvim
  command to restart pow process
  added powed command to list pow urls
  fix gnzh theme to detect local rvm installations
  Added link to wiki page for plugins to README.
  Add gem build autocompletion
  `setopt append_history` is not necessary.
  Plugin: Rake-fast: Support both *nix and Darwin
  New aliases for 'apt-get' and 'aptitude' as they were overwritten by later aliases
  Fixed typos + made wording more consistent in zshrc.zsh-template
  history-substring-search: bindkey now checks if terminfo is available first.
  adding xargs -0 to node aliases
  updated readme.md and using tab char for formatting with node
  bug fix for node pp_json version
  Add check for display list equals nil
  updating README.md
  adding README.md for jsontools
  $ZSH is the OMZ installation folder, not configuration
  mention $ZSH_CUSTOM as suggested in #2295
  suggest setting $LANG to fix #1286 and fix #1823
  Fix export syntax of $GREP_OPTIONS
  Sort bundled commands alphabetically
  add common video formats FLV and WEBM
  Add irb to the list of bundled commands
  Add new brew cask commands
  Added a forward-delete fallback to bind Delete key
  atom plugin
  Aligned comments
  Update key-bindings.zsh
  added terminfo keys verification
  Fix dirpersist plugin
  Fixed errors if acpitool isn't installed on linux
  Add chef-vault knife cmd support
  Add scd plugin for smart change of directory.
  Don't show useless '[]' when chruby_prompt_info is empty
  Fix gwip alias in git plugin when no files to rm
  Don't set RBENV_ROOT to "$HOME/.rbenv" when using Homebrew rbenv
  Don't lazy load the virtualenvwrapper.
  Remove copyright information, as per #2588
  Ignore more users in ssh completion.
  add option to show dirty status of current dir
  Added v as a keybinding to edit-command-line
  ssh-agent: prevent environment file from flapping
  Fixing a few quirks in the latest installer updates (quoting /Users/robbyrussell/.oh-my-zsh and such). Also mentioining our twitter account after install
  Use zsh's default for ':completion:*:hosts'
  Update license year
  Updating README to show the new install URL, which redirects to the raw files on github.
  List pkgs by size
  Fixes #2467 tab completion scrolls back in terminal when using bureau theme
  Add github url shortener
  Fix typo in autocomplete arguments
  Removed unsolicited aliases.
  Fix hgsl alias.
  Document alternate install paths via ZSH variable
  Abort installer on errors
  Write install path into .zshrc
  Reference default install path from ZSH variable
  Remove all copyright information in themes. Closes #2587
  added mvnjetty alias
  added aliases for tomcat:run tomcat7:run
  added mvn-update
  Updated wd plugin to v0.3.0
  Added dirhistory plugin.
  Integrate changes from #1841.
  added the linux implementation to the battery plugin
  Fixed sublime plugin behaviors.
  :panda_face: Added simulator alias for Xcode plugin
  adding support for node
  gem push alias and gem yank alias
  add gem push alias
  add gem build alias
  Adds command line aliases useful for dealing with JSON
  ..a fundamental piece of matter.
  Verification of convert inside the function
  grab last item in list which is the branch instead of relying on position.
  Much needed PEP8 love. Use spaces, not tabs.
  Avoid 'title:parse error' with single quotes in $CMD Fixes #2182
  Revert previous commit, escape %
  Use single quotes also in $LINE definiton
  Avoid evaluating special chars in $LINE on title command (fixes #2234)
  Adieu l'ami.
  Remove mailcatcher from the bundler plugin.
  Fix remaining broken URL in gitignore function
  Update gitignore.plugin.zsh
  Fix URL to gi (gitignore) function
  Add cabal_sandbox_info function
  Update battery plugin to show calculating - OSX
  Added Yii basic command completion
  Add rake-fast plugin for fast rake autocompletion
  Improve oneline logs
  update golang plugin to match official version
  remove duplicate 'go' plugin, symlink to 'golang'
  Updated _brew zsh autocompletion to latest Homebrew upstream
  Add 'services' command to homebrew completion
  provides iwhois command to use CNAMES under whois.geek.nz to find most accurate whois server
  Makes history-substring-search use term specific up and down buttons. Fixes #2089.
  Add scd plugin for smart change of directory.
  `fc -l 1` instead of `history` in zsh_stats #2501
  highlight the username when root
  theme agnoster: remove trailing space
  corrected branch character
  updated url to latest powerline-patched fonts
  Improve virtualenv prompt in steeef theme
  Update nyan.plugin.zsh
  change nyancat telnet server
  Adds a method that print a battery gauge
  Add Laravel4 plugin
  Adding commit hash to branch name in my favorit rjk-repos theme.
  Fixes _rails_command
  Renames main plugin function to `svn_prompt_info`
  Renamed the methods of this script
  Added further cleanup and svn status information
  No need to eval in rvm_prompt_info!
  Heavy refactor of svn-fast-info
  Inline `parse_svn` to avoid leaky state
  Report the SVN need upgrade
  Fixes RPROMPT in af-magic.zsh-theme
  Renames the file to prompt_info_functions.zsh
  Adds documentation.
  Adds all other dummy implementations.
  new faster SVN plugin
  add brew-cask plugin
  Updates spectrum.zsh
  Refactors ruby_prompts.zsh
  Joins ruby prompt files and adds ruby_prompt_info.
  Adds chruby_prompt_info dummy function.
  Returns false when rbenv is not found.
  Returns false when rvm is not found.
  Fixes rvm_prompt_info() in lib/rvm.zsh
  add chruby info to gallois theme
  fix name schema for sudo plugin
  Add support to command "show"
  Prevents oh-my-zsh loading the .zshenv twice
  Add rdmtc alias for rails plugin.
  typo fix
  catimg: fix exit without using source supresses errors from convert whilen converting, as they are usually just warnings
  Fixed a dirs bug for catimg
  Fix for virtualenv support - fixes #2328, fixes #2297, resolves #2319
  catimg plugin allow to print an image to the stdout using convert
  Improve comments
  Improve comments
  Added/modified some useful aliases.
  don't clobber existing RBENV_ROOT & follow Homebrew's default behavior
  Added a completion plugin for the new aws-cli tool
  Add reload and status alises to postgres
  Add completion for package add and remove
  Add autocompletion plugin for meteor command
  gitfast: update to upstream v1.8.4
  plugged_in function
  Update to latest per-directory-history
  Update to latest per-directory-history
  Added check for .git directory in current, before wasting time querying git. This saves seconds on my pc.
  git lol
  more catspeak
  Fix /bin/sh compatibility issue in install.sh
  Replace hardcoded key escape sequeneces with dynamic ones from terminfo.
  Make sure the terminal is always in application mode when zle is active.
  Don't clobber standard Esc+. behavior
  forgot to save before committing. doh
  Added documentation to key bindings.
  Rendering the 'vagrant box (remove|repackage)' completion code independant of Vagrant implementation details.
  application completion
  library completion
  in hindsight, this is probably a bad idea
  completion of targets
  instance and cluster completion
  node completion
  help command, node completion
  added _files values for certain options
  completion options
  added alias
  added completions for all known arguments to all known commands
  apparently, this file must exist for the plugin to load
  added completion for all asadmin subcommands
  avoid VCS folders
  Move example plugin to the custom plugins dir.
  command to restart pow process
  Added an <esc> to the begining of everything. I ran something when I was in insert mode once and all it did was shove !args... into the buffer.  <esc> first.
  Updated the README to include documentation on the postCallVim callout
  Added an optional callout to the end of the interaction function. I put it in to allow me to put the window focus on MacVim / GVim depending on the different OS I happen to be on
  Fixed: If you callvim on a non-existant file with a relative path, the CWD of the running gvim process is used, and that's not right.  We use the PWD explicitly instead, in this case
  A plugin that makes it easier to interact with the (single) running instance of gvim
  added powed command to list pow urls
  fix gnzh theme to detect local rvm installations
  Added link to wiki page for plugins to README.
  Add gem build autocompletion
  Add completion for pip install -r - so that it autocompletes requirements filenames
  `setopt append_history` is not necessary.
  Add zsh_reload which provides src function, this function will source .zshrc and rebuilds cache
  Update the script to account for the changes in 0.1.7 where .gas is a directory
  Do not overwrite EDITOR environment variable if already defined.
  Comment
  Fix builtin `ecd' when file path contains space characters.
  Change default zshrc to export $ZSH (as required by check_for_upgrade.sh).
  New function `efile`
  Fix indentation
  Fix alias `eeval'
  - Fix pass of parameters - Add new function `ecd'.
  More comments
  I should not have merged this here.
f8b5232
@benjaoming benjaoming referenced this pull request from a commit in benjaoming/oh-my-zsh
@kevinxucs kevinxucs Integrate changes from #1841. 5c3e5ae
@trynity trynity referenced this pull request from a commit in trynity/oh-my-zsh
@kevinxucs kevinxucs Integrate changes from #1841. 993b378
@kenton kenton referenced this pull request from a commit in kenton/oh-my-zsh
@kevinxucs kevinxucs Integrate changes from #1841. 058579f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 12, 2014
  1. @tsalzer

    Sublime plugin should check more locations

    tsalzer authored
    On OSX, the sublime plugin checks for various possible locations of the
    Sublime Text application; on Linux, however, only two spots are covered.
    This change uses the same detection mechanism used for OSX for Linux
    systems to check for the typical install locations:
    
        $HOME/bin/sublime_text
        /usr/local/bin/sublime_text
        /usr/bin/sublime_text
    
    This allows non-root users on Linux systems to use the plugin without
    hassle.
This page is out of date. Refresh to see the latest.
Showing with 10 additions and 8 deletions.
  1. +10 −8 plugins/sublime/sublime.plugin.zsh
View
18 plugins/sublime/sublime.plugin.zsh
@@ -5,16 +5,18 @@ if [[ $('uname') == 'Linux' ]]; then
_sublime_linux_paths=(
"$HOME/bin/sublime_text"
"/opt/sublime_text/sublime_text"
- "/usr/bin/sublime_text"
"/usr/local/bin/sublime_text"
+ "/usr/local/bin/sublime-text"
+ "/usr/bin/sublime_text"
+ "/usr/bin/sublime-text"
)
- for _sublime_path in $_sublime_linux_paths; do
- if [[ -a $_sublime_path ]]; then
- st_run() { $_sublime_path $@ >/dev/null 2>&1 &| }
- alias st=st_run
- break
- fi
- done
+ for _sublime_path in $_sublime_linux_paths; do
+ if [[ -a $_sublime_path ]]; then
+ st_run() { nohup $_sublime_path $@ > /dev/null 2>&1 &| }
+ alias st=st_run
+ break
+ fi
+ done
elif [[ $('uname') == 'Darwin' ]]; then
local _sublime_darwin_paths > /dev/null 2>&1
Something went wrong with that request. Please try again.