Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/update-4.17'
Browse files Browse the repository at this point in the history
  • Loading branch information
getnamo committed Aug 18, 2017
2 parents 73f0cee + 1d9c019 commit 7c979c5
Show file tree
Hide file tree
Showing 379 changed files with 25,815 additions and 1,571 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,7 @@ ENV/
Binaries/

#don't update this file again
Content/Scripts/upyconfig.json
Content/Scripts/upyconfig.json
python35/
python27/
*.un~
3 changes: 3 additions & 0 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Roberto De Ioris (maintainer and developer, 20Tab)
Ikrima Elhassan (developer and sponsor, Kite & Lightning)
Tony Barbieri
Huey Park
Eric Feng

3 changes: 0 additions & 3 deletions Content/Scripts/upyconfig.json

This file was deleted.

9 changes: 9 additions & 0 deletions Content/Scripts/upystartup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import unreal_engine as ue
import json
import upycmd as cmd
import os
from os import listdir
from os import path as ospath

Expand All @@ -12,6 +13,14 @@ def checkPipDirectory():
configPath = cmd.PythonPluginScriptPath() + '/upyconfig.json'
correctPipPath = cmd.PythonHomeScriptsPath()

#check that we have a config file, if not make an empty one
if not (os.path.exists(configPath)):
with open(configPath, "w+") as configFile:
configs = {}
configs['pipDirectoryPath'] = ""
configFile.seek(0)
configFile.write(json.dumps(configs))

#compare our current pip directory with the installed one, if they differ reinstall pip

with open(configPath, "r+") as configFile:
Expand Down
Loading

0 comments on commit 7c979c5

Please sign in to comment.