scripts/install.py

changeset 7813
5d0dbec7b815
parent 7812
44004f273a7b
child 7814
6fa40642ed7c
diff -r 44004f273a7b -r 5d0dbec7b815 scripts/install.py
--- a/scripts/install.py	Sun Oct 25 11:17:02 2020 +0100
+++ b/scripts/install.py	Sun Oct 25 12:28:07 2020 +0100
@@ -56,6 +56,7 @@
 
 installInfoName = "eric6install.json"
 installInfo = {}
+installCwd = ""
 
 # Define blacklisted versions of the prerequisites
 BlackLists = {
@@ -1307,7 +1308,7 @@
     """
     Record information about the way eric6 was installed.
     """
-    global installInfo, cfg
+    global installInfo, installCwd, cfg
     
     installDateTime = datetime.datetime.now(tz=None)
     try:
@@ -1317,7 +1318,7 @@
     installInfo["user"] = os.getlogin()
     installInfo["exe"] = sys.executable
     installInfo["argv"] = " ".join(shlex.quote(a) for a in sys.argv[:])
-    installInfo["install_cwd"] = os.getcwd()
+    installInfo["install_cwd"] = installCwd
     installInfo["eric"] = cfg["ericDir"]
     installInfo["virtualenv"] = installInfo["eric"].startswith(
         os.path.expanduser("~"))
@@ -1864,7 +1865,7 @@
     global progName, modDir, doCleanup, doCompile, distDir, cfg, apisDir
     global sourceDir, eric6SourceDir, configName
     global macAppBundlePath, macAppBundleName, macPythonExe
-    global installApis, doCleanDesktopLinks, yes2All
+    global installApis, doCleanDesktopLinks, yes2All, installCwd
     
     if sys.version_info < (3, 5, 0) or sys.version_info > (3, 99, 99):
         print('Sorry, eric6 requires at least Python 3.5 for running.')
@@ -1872,6 +1873,8 @@
     
     progName = os.path.basename(argv[0])
     
+    installCwd = os.getcwd()
+    
     if os.path.dirname(argv[0]):
         os.chdir(os.path.dirname(argv[0]))
     

eric ide

mercurial