Fixed icons path and permissions issue with installing python.app

sharppy · Jan 22, 2019 · c0d2c45 · c0d2c45
1 parent 1563b55
commit c0d2c45
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -63,7 +63,7 @@ steps:
 # Must use sudo for python-dependent stuff because conda permissions have
 # stupid bug under macOS.
 - script: |
-    conda install -y -c conda-forge python.app 
+    sudo conda install -y -q -c conda-forge python.app 
     system_profiler SPDisplaysDataType | grep Resolution # Check display dimensions using OS tools
     sudo python ci/screen.py # Check display dimensions as seen by PySide
     sudo python setup.py -q install

diff --git a/runsharp/SHARPpy-osx.spec b/runsharp/SHARPpy-osx.spec
@@ -63,7 +63,7 @@ exe = EXE(pyz,
 
 app = BUNDLE(exe,
              name='SHARPpy.app',
-             icon='runsharp/icons/SHARPpy.icns',
+             icon='icons/SHARPpy.icns',
              info_plist={
                     'NSPrincipalClass': 'NSApplication',
                     'NSHighResolutionCapable': 'True',

diff --git a/runsharp/SHARPpy-win7-64.spec b/runsharp/SHARPpy-win7-64.spec
@@ -64,7 +64,7 @@ exe = EXE(pyz,
           debug=False,
           strip=None,
           upx=True,
-          console=False, icon='runsharp\\icons\\SHARPpy.ico')
+          console=False, icon='icons\\SHARPpy.ico')
 
 # Revert the _version.py file to its original version using git
 import subprocess