Changeset 3431

Timestamp:

Jun 11, 2018 5:53:52 PM (5 years ago)

Author:

toby

Message:

latest packaging/bootstrap mods

Location:

install

Files:

• GSASIIproxy.zip (deleted)
• GSASIIsvn.zip (deleted)
• GSASIIsvn17.zip (deleted)
• g2conda-Mac.sh (deleted)
• g2pkg/meta.yaml (modified) (1 diff)
• g2pkg/src/bootstrap.py (modified) (3 diffs)

install/g2pkg/meta.yaml

@@ -1 +1 @@
 package: 
   name: gsas2pkg
-  version: "1.0.4"  # remember to change in g2conda/construct.yaml to match this
+  version: "1.0.6"  # remember to change in g2conda/construct.yaml to match this
 
 source:

install/g2pkg/src/bootstrap.py

@@ -2 +2 @@
 # Installs GSAS-II from network using subversion and creates platform-specific shortcuts.
 # works for Mac & Linux & Windows
-import os, stat, sys, platform, subprocess
+import os, stat, sys, platform, subprocess, datetime
 
 g2home = 'https://subversion.xray.aps.anl.gov/pyGSAS/'
 path2GSAS2 = os.path.dirname(os.path.abspath(os.path.expanduser(__file__)))
-print('Running bootstrap from {}'.format(path2GSAS2))
+now = str(datetime.datetime.now())
+print('Running bootstrap from {} at {}'.format(path2GSAS2,now))
+fp = open(os.path.join(path2GSAS2,'bootstrap.log'),'a')
+fp.write('Running bootstrap from {} at {}\n'.format(path2GSAS2,now))
+fp.close()
 ################################################################################
 ################################################################################
@@ -183 +187 @@
 proxyinfo = os.path.join(path2GSAS2,"proxyinfo.txt")
 host = None
-port = '8080'
+port = '80'
 if os.path.exists(proxyinfo):
     fp = open(proxyinfo,'r')
@@ -196 +200 @@
     getinput = input
 try:
-    if host:
+    key = None
+    for i in os.environ.keys():
+        if 'https_proxy' == i.lower():
+            key = i
+            break
+    else:
+        for i in os.environ.keys():
+            if 'http_proxy' == i.lower():
+                key = i
+                break
+    if key:
+        val = os.environ[key].strip()
+        if val[-1] == '/':
+            val = val[:-1]
+        if len(val.split(':')) > 2:
+            host = ':'.join(val.split(':')[:-1])
+            port = val.split(':')[-1]
+        else:
+            host = ':'.join(val.split(':')[:-1])
+            port = val.split(':')[-1]
+    elif host:
         ans = getinput("Enter the proxy address (type none to remove) ["+host+"]: ")
         if ans.strip().lower() == "none": host = ans = ""
     else:
         ans = getinput("Enter your proxy address [none needed]: ")
+    if ans.strip() != "" or host:
+        ans = getinput("Enter the proxy port ["+port+"]: ")
+        if ans.strip() == "": ans=port
+        port = ans
 except EOFError:
-    ans = ""
-if ans.strip() != "" or host:
+    host = ""
+    port = ""
+if host:
     proxycmds.append('--config-option')
-    if ans.strip() == "": ans=host
-    proxycmds.append('servers:global:http-proxy-host='+ans.strip())
+    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(ans.strip()+'\n')
-    ans = getinput("Enter the proxy port ["+port+"]: ")
-    if ans.strip() == "": ans=port
-    proxycmds.append('--config-option')
-    proxycmds.append('servers:global:http-proxy-port='+ans.strip())
-    fp.write(ans.strip()+'\n')
+    fp.write(host.strip()+'\n')
+    fp.write(port.strip()+'\n')
     fp.close()