Changes between Version 15 and Version 16 of MacSingleStepInstallerFigs

Timestamp:

Jan 19, 2020 11:51:25 AM (3 years ago)

Author:

toby

Comment:

--

MacSingleStepInstallerFigs

@@ -1 +1 @@
 == Installing GSAS-II with a Single-Step Download (with figures) ==
 
-=== Step 1: ===
+This process downloads an installer that will place a working version of Python and the required packages onto your computer, it will then initially install a slightly out-of-date version of GSAS-II including the binaries files needed for running on a Mac. Finally, the distribution site will be checked and updates will be applied to bring GSAS-II up to date (usually with minor download requirements). The installer can be moved to and run on computers without an internet connection, but the update step will fail, leaving a working up not out-of-date version of GSAS-II. 
 
-Download this file:
+=== Step 1:===
+Open a terminal window (use the Terminal app in Applications/Utilities folder; typing terminal.app into the finder search box should find this for you).
 
-* https://subversion.xray.aps.anl.gov/admin_pyGSAS/downloads/gsas2full-Latest-MacOSX-x86_64.sh (provides Python 3.7, all required Python packages and a recent version of GSAS-II which will be updated via the internet; can be installed on computers without an internet connection, but without that update.)
+In that window cut and paste the two commands below:
 
-These links offer an older distributions that have worked for many people, if you have trouble with the previous (but please do report problems). Note that these installers require an internet connection: 
+{{{
+g2="https://subversion.xray.aps.anl.gov/admin_pyGSAS/downloads/gsas2full-latest-MacOSX-x86_64.sh"
+curl "$g2" > /tmp/g2.sh; bash /tmp/g2.sh
+}}}
 
-* https://subversion.xray.aps.anl.gov/admin_pyGSAS/downloads/g2conda-1.0.1-MacOSX-x86_64.sh (Python 3.7, wxPython 4.0.3, !NumPy 1.51.1, !SciPy 1.1.0, matplotlib 2.2.3,...)
-* https://subversion.xray.aps.anl.gov/admin_pyGSAS/downloads/g2conda-py27-1.0.2-MacOSX-x86_64.sh (Python 2.7.x, wxPython 3.0.0...) 
-* ```g2conda-0.1.2-MacOSX-x86_64.sh``` from this URL https://anl.box.com/v/GSASII4mac12 (quite old, not recommended)
+ [[Image(0.jpg, 600)]]
 
 
+Note that this will fail if your network requires a proxy to access 
+the internet. You can download the file with a browser and run it [#BrowserDownload using steps listed below.] You will need to know the proxy information in order to get GSAS-II to properly update.
+
 === Step 2:===
-Execute this file. 
-
- Type "bash " into a terminal window, then drag the downloaded file from a finder window into the terminal window.  
-
- [[Image(1.jpg, 500)]]
-
- This places the file name with full path name into the terminal window, then press Enter. 
-
- [[Image(2.jpg, 400)]]
-
-
-=== Step 3:===
 Answer prompts from the install script. 
 
@@ -94 +87 @@
  [[Image(14.jpg, 400)]]
 
+[=#BrowserDownload]
+= Installing with a web proxy or to a system without the internet =
+
+=== Step A1: ===
+
+Download this file in a web browser:
+
+* https://subversion.xray.aps.anl.gov/admin_pyGSAS/downloads/gsas2full-Latest-MacOSX-x86_64.sh (provides Python 3.7, all required Python packages and a recent version of GSAS-II which will be updated via the internet; can be installed on computers without an internet connection, but without that update.)
+
+=== Step A2:===
+Execute this file. 
+
+ Type "bash " into a terminal window, then drag the downloaded file from a finder window into the terminal window.  
+
+ [[Image(1.jpg, 500)]]
+
+ This places the file name with full path name into the terminal window, then press Enter. 
+
+ [[Image(2.jpg, 400)]]
 
 
+
+
+== Older installers ==
+
+These links offer an older distributions that have worked for many people, if you have trouble with the previous (but please do report problems). Note that these installers require an internet connection to complete the installation: 
+
+* https://subversion.xray.aps.anl.gov/admin_pyGSAS/downloads/g2conda-1.0.1-MacOSX-x86_64.sh (Python 3.7, wxPython 4.0.3, !NumPy 1.51.1, !SciPy 1.1.0, matplotlib 2.2.3,...)
+* https://subversion.xray.aps.anl.gov/admin_pyGSAS/downloads/g2conda-py27-1.0.2-MacOSX-x86_64.sh (Python 2.7.x, wxPython 3.0.0...) 
+* ```g2conda-0.1.2-MacOSX-x86_64.sh``` from this URL https://anl.box.com/v/GSASII4mac12 (quite old, not recommended)
+
+
+