-
Notifications
You must be signed in to change notification settings - Fork 69
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.
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
Fix python in msys2 #124
Closed
+55
−33
Closed
Fix python in msys2 #124
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
052cdc5
Admin can symlink on Windows
moeshin b93c27d
Revert "Fix python in msys2"
moeshin 0b2963c
Fix python in msys2
moeshin 5c0ce75
Revert "remove extra drive path from MSYS2 on Windows"
moeshin aa19121
Revert "Cleanup async job command"
moeshin c948a4a
Revert "split shell commands when using as cmd list"
moeshin 0abb2ec
Revert "Fix neovim async running of install script on Windows"
moeshin e459005
Merge remote-tracking branch 'fork/master'
moeshin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -472,15 +472,21 @@ def download(url, filePath): | |
def createSymlink(): | ||
if is_win: | ||
link = os.path.join(getResourcesFolder(), 'wakatime-cli.exe') | ||
if os.path.exists(link): | ||
exists = os.path.exists(link) | ||
if exists and not os.path.islink(link): | ||
try: | ||
os.remove(link) | ||
exists = False | ||
except: | ||
log(traceback.format_exc()) | ||
try: | ||
shutil.copy2(getCliLocation(), link) | ||
except: | ||
log(traceback.format_exc()) | ||
if not exists: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'll change this to try copying even when already exists, but only if we've successfully downloaded an updated wakatime-cli. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
try: | ||
os.symlink(getCliLocation(), link) | ||
except: | ||
try: | ||
shutil.copy2(getCliLocation(), link) | ||
except: | ||
log(traceback.format_exc()) | ||
else: | ||
link = os.path.join(getResourcesFolder(), 'wakatime-cli') | ||
if not os.path.exists(link): | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can't use
system()
during init because it slows down startup for all Windows users.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should work instead?
vim-wakatime/plugin/wakatime.vim
Line 94 in bbfa0fb