Changeset 4748 for install

Timestamp:

Jan 7, 2021 10:22:55 PM (2 years ago)

Author:

toby

Message:

still more work on install for OSX

Location:

install

Files:

• bootstrap.py (modified) (1 diff)
• g2complete/src/bootstrap.py (modified) (1 diff)
• g2full/g2postinstall.sh (modified) (1 diff)

install/bootstrap.py

@@ -583 +583 @@
     print('\n'+75*'*')
 else:
-    svncleanup(path2GSAS2)
+    svn = whichsvn()
+    if svn: svncleanup(path2GSAS2)
 
 # subsequent commands require GSASIIpath which better be here now, import it

install/g2complete/src/bootstrap.py

@@ -583 +583 @@
     print('\n'+75*'*')
 else:
-    svncleanup(path2GSAS2)
+    svn = whichsvn()
+    if svn: svncleanup(path2GSAS2)
 
 # subsequent commands require GSASIIpath which better be here now, import it

install/g2full/g2postinstall.sh

@@ -27 +27 @@
    echo "$PREFIX/bin/python $PREFIX/GSASII/GSASII.py" >> $PREFIX/start_GSASII.sh
 fi
-#create the GSAS-II app or Desktop icon (note that scripts run only on correct platform)
-#$PREFIX/bin/python $PREFIX/GSASII/makeMacApp.py
-#$PREFIX/bin/python $PREFIX/GSASII/makeLinux.py
 echo "GSAS-II bootstrap completed"