Changeset 1242 for gsas

Timestamp:

Dec 4, 2013 7:34:31 PM (9 years ago)

Author:

toby

Message:

more linux fixes

Location:

gsas/linux/dist

Files:

• bootstrap.py (modified) (2 diffs)
• makeGnomeIcon.py (modified) (1 diff)

gsas/linux/dist/bootstrap.py

@@ -96 +96 @@
     os.chmod(gsaspath + "/expgui/expgui", 
              stat.S_IXUSR | stat.S_IRUSR | stat.S_IRGRP | stat.S_IXGRP | stat.S_IXOTH) 
+    if not os.path.exists(os.path.join(gsaspath,'EXPGUI.png')):
+        import shutil
+        shutil.copy(os.path.join(gsaspath,'EXPGUI_linux.png'),
+                    os.path.join(gsaspath,'EXPGUI.png'))
+        shutil.copy(os.path.join(gsaspath,'GSAS_linux.png'),
+                    os.path.join(gsaspath,'GSAS.png'))
     if os.path.exists(os.path.expanduser('~/Desktop/')):
         open(os.path.expanduser('~/Desktop/EXPGUI.desktop'),'w').write('''
@@ -120 +126 @@
 ''' % (gsaspath,gsaspath))
         os.chmod(os.path.expanduser('~/Desktop/GSAS.desktop'),
-                 stat.S_IWUSR | stat.S_IXUSR | stat.S_IRUSR | stat.S_IRGRP | stat.S_IXGRP | stat.S_IXOTH) 
+                 stat.S_IWUSR | stat.S_IXUSR | stat.S_IRUSR | stat.S_IRGRP | stat.S_IXGRP | stat.S_IXOTH)
+    else:
+        print 'No Desktop directory found, are you running this as root?'
+        #print 'Run '+str(os.path.join(gsaspath,'mkGnomeIcon.py'))+' from your user account(s)'

gsas/linux/dist/makeGnomeIcon.py

@@ +1 @@
+# this needs more work before it can be used
+import os,shutil
+if not os.path.exists(os.path.join(gsaspath,'EXPGUI.png')):
+    shutil.copy(os.path.join(gsaspath,'EXPGUI_linux.png'),
+                os.path.join(gsaspath,'EXPGUI.png'))
+    shutil.copy(os.path.join(gsaspath,'GSAS_linux.png'),
+                os.path.join(gsaspath,'GSAS.png'))
 if os.path.exists(os.path.expanduser('~/Desktop/')):
     os.chmod(gsaspath + "/expgui/expgui",