Changeset 4376 for install/g2complete/src/bootstrap.py

Timestamp:

Mar 19, 2020 4:27:06 PM (4 years ago)

Author:

toby

Message:

update bootstrap to use all proxy options

File:

• install/g2complete/src/bootstrap.py (modified) (11 diffs, 1 prop)

install/g2complete/src/bootstrap.py

@@ -5 +5 @@
 import os, stat, sys, platform, subprocess, datetime
 
-version = "$Id: bootstrap.py 3515 2018-07-30 02:14:14Z toby $"
+version = "$Id$"
 g2home = 'https://subversion.xray.aps.anl.gov/pyGSAS/'
 path2GSAS2 = os.path.dirname(os.path.abspath(os.path.expanduser(__file__)))
@@ -69 +69 @@
     else:
         print("BOOTSTRAP WARNING: ",file=sys.stderr)
-        print(msg.replace('\n',' '),file=sys.stderr)
-        print(" Recreate this using command: {} {} {}".format(
+        for line in msg.split('\n'):
+            print(line,file=sys.stderr)
+        print("Recreate this using command:")
+        print("     {} {} {}".format(
             os.path.abspath(sys.executable),
             os.path.abspath(os.path.expanduser(__file__)),
@@ -110 +112 @@
     '''Loads a proxy for subversion from the file created by bootstrap.py
     '''
-    proxyinfo = os.path.join(path2GSAS2,"proxyinfo.txt")
-    if os.path.exists(proxyinfo):
-        global proxycmds
-        global host,port  # only in bootstrap.py
-        proxycmds = []
-        fp = open(proxyinfo,'r')
+    global proxycmds
+    proxycmds = []
+    proxyinfo = os.path.join(os.path.expanduser('~/.G2local/'),"proxyinfo.txt")
+    if not os.path.exists(proxyinfo):
+        proxyinfo = os.path.join(path2GSAS2,"proxyinfo.txt")
+    if not os.path.exists(proxyinfo):
+        return '','',''
+    fp = open(proxyinfo,'r')
+    host = fp.readline().strip()
+    # allow file to begin with comments
+    while host.startswith('#'):
         host = fp.readline().strip()
-        port = fp.readline().strip()
-        fp.close()
-        setsvnProxy(host,port)
-        if not host.strip(): return '',''
-        return host,port
-    return '',''
-
-def setsvnProxy(host,port):
+    port = fp.readline().strip()
+    etc = []
+    line = fp.readline()
+    while line:
+        etc.append(line.strip())
+        line = fp.readline()
+    fp.close()
+    setsvnProxy(host,port,etc)
+    return host,port,etc
+
+def setsvnProxy(host,port,etc=[]):
     '''Sets the svn commands needed to use a proxy
     '''
@@ -131 +141 @@
     host = host.strip()
     port = port.strip()
-    if not host.strip(): return
-    proxycmds.append('--config-option')
-    proxycmds.append('servers:global:http-proxy-host='+host)
-    if port.strip():
+    if host: 
         proxycmds.append('--config-option')
-        proxycmds.append('servers:global:http-proxy-port='+port)
+        proxycmds.append('servers:global:http-proxy-host='+host)
+        if port:
+            proxycmds.append('--config-option')
+            proxycmds.append('servers:global:http-proxy-port='+port)
+    for item in etc:
+        proxycmds.append(item)
         
 def whichsvn():
@@ -153 +165 @@
     svnprog = 'svn'
     if sys.platform.startswith('win'): svnprog += '.exe'
-    host,port = getsvnProxy()
+    host,port,etc = getsvnProxy()
     if GetConfigValue('debug') and host:
         print('DBG_Using proxy host {} port {}'.format(host,port))
@@ -269 +281 @@
 print('Ready to bootstrap GSAS-II from repository\n\t'+g2home+'\nto '+path2GSAS2)
 proxycmds = []
-proxyinfo = os.path.join(path2GSAS2,"proxyinfo.txt")
-if os.path.exists(proxyinfo):
-    fp = open(proxyinfo,'r')
-    host = fp.readline().strip()
-    port = fp.readline().strip()
-    fp.close()
-    os.remove(proxyinfo)
-print(70*"=")
+host,port,etc = getsvnProxy()
 if sys.version_info[0] == 2:
     getinput = raw_input
@@ -282 +287 @@
     getinput = input
 
-# get proxy from environment variable
+# get proxy setting from environment variable
 key = None
 for i in os.environ.keys():
@@ -311 +316 @@
         host = ""
     elif host:
+        print('\n'+75*'*')
         ans = getinput("Enter the proxy address (type none to remove) ["+host+"]: ").strip()
         if ans.lower() == "none": host = ""
@@ -320 +326 @@
         if ans == "": ans=port
         port = ans
+        print('If your site needs additional svn commands (such as \n\t',
+                  '--config-option servers:global:http-proxy-username=*account*','\n\t',
+                  '--config-option servers:global:http-proxy-password=*password*',
+                  '\nenter them now:')
+        if etc:
+            prevetc = ' '.join(etc)
+            print('\nDefault for next input is "{}"'.format(prevetc))
+            prompt = "Enter additional svn options (if any) [use previous]: "
+        else:
+            prompt = "Enter additional svn options (if any) [none]: "
+        ans = 'start'
+        etcstr = ''
+        while ans:
+            ans = getinput(prompt).strip()
+            prompt = "more svn options (if any): "
+            if etcstr: etcstr += ' '
+            etcstr += ans
+        if etcstr.strip():
+           etc = etcstr.split()
 except EOFError:
     host = ""
     port = ""
+    etc = []
+setsvnProxy(host,port,etc)
+# delete old proxy files
+localproxy = os.path.join(os.path.expanduser('~/.G2local/'),"proxyinfo.txt")
+for proxyinfo in localproxy,os.path.join(path2GSAS2,"proxyinfo.txt"):
+    if os.path.exists(proxyinfo):
+        try:
+            os.remove(proxyinfo)
+            print('Deleted file {}'.format(proxyinfo))
+        except:
+            pass
 if host:
-    proxycmds.append('--config-option')
-    proxycmds.append('servers:global:http-proxy-host='+host.strip())
-    if port:
-        proxycmds.append('--config-option')
-        proxycmds.append('servers:global:http-proxy-port='+port.strip())
-    fp = open(proxyinfo,'w')
-    fp.write(host.strip()+'\n')
-    fp.write(port.strip()+'\n')
-    fp.close()
-    fp = open(os.path.join(path2GSAS2,'bootstrap.log'),'a')
-    fp.write('Proxy info written: {} port\n'.format(host,port))
-    print('Proxy info written: {} port'.format(host,port))
-    fp.close()
-
+    try:
+        fp = open(proxyinfo,'w')
+    except:
+        fp = open(localproxy,'w')
+        proxyinfo = localproxy
+    try:
+        fp.write(host.strip()+'\n')
+        fp.write(port.strip()+'\n')
+        for i in etc:
+            if i.strip():
+                fp.write(i.strip()+'\n')
+        fp.close()
+        msg = 'Proxy info written: {} port {} etc {}\n'.format(host,port,etc)
+        print(msg)
+        fp = open(os.path.join(path2GSAS2,'bootstrap.log'),'a')
+        fp.write(msg)
+        fp.close()
+    except Exception as err:
+        print('Error writing file {}:\n{}'.format(proxyinfo,err))
 if not skipDownloadSteps:
     # patch: switch GSAS-II location if linked to XOR server (relocated May/June 2017)
@@ -412 +453 @@
             if os.path.exists(os.path.join(path2GSAS2,"makeBat.py")):
                 msg += '\n\nGSAS-II failed to be updated. A likely reason is a network access'
-                msg += '\nproblem. If your web browser works, but the update did not,'
-                msg += '\nthe most common reason is you need to use a network proxy. Please'
+                msg += '\nproblem. If your web browser works, but the update did not.'
+                msg += '\nThe most common reason is you need to use a network proxy. Please'
                 msg += '\ncheck with a network administrator or use http://www.whatismyproxy.com/'
             else:
@@ -420 +461 @@
                 msg += '\n\n  *** GSAS-II failed to be installed. A likely reason is a network access'
                 msg += '\n  *** problem, most commonly because you need to use a network proxy. Please'
-                msg += '  *** check with a network administrator or use http://www.whatismyproxy.com/\n'
+                msg += '\n  *** check with a network administrator or use http://www.whatismyproxy.com/\n'
             BailOut(msg)
     print('\n'+75*'*')