Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better OSX detection #853

Merged
merged 3 commits into from
Jun 15, 2018
Merged

Better OSX detection #853

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0d87db
Better OSX detection
bubba-h57 Jun 15, 2018
a053179
Use the case-insensitive regex
bubba-h57 Jun 15, 2018
08db3a0
Do not need to check for unix os here.
bubba-h57 Jun 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions nerdtree_plugin/fs_menu.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,10 +225,12 @@ endfunction
function! NERDTreeListNode()
let treenode = g:NERDTreeFileNode.GetSelected()
if !empty(treenode)
if has("osx")
let stat_cmd = 'stat -f "%z" '
else
let stat_cmd = 'stat -c "%s" '
if has("unix")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Taking a wider look at this file, I noticed that this if has("unix") statement has already been done on line 41, so we don't need it again here.

let s:uname = system("uname")
let stat_cmd = 'stat -c "%s" '
if s:uname == "Darwin\n"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change this operator to =~? and remove the \n. The case-insensitive regex will help future-proof the if statement. See :h expr-=~?.

let stat_cmd = 'stat -f "%z" '
endif
endif

let cmd = 'size=$(' . stat_cmd . shellescape(treenode.path.str()) . ') && ' .
Expand Down