Make automator.sh executable and update icon paths for Linux and macOS

urban233 · urban233 · commit fbdf6e3b8b68 · 2025-03-30T13:40:56.000+02:00
diff --git a/.github/workflows/build_app.yaml b/.github/workflows/build_app.yaml
@@ -105,6 +105,7 @@ jobs:
 
       - name: Build app package
         run: |
+          chmod +x ./automator.sh 
           ./automator.sh build app
 
       - name: Rename app package
diff --git a/os_specific/linux/setup_build_exe.py b/os_specific/linux/setup_build_exe.py
@@ -4,8 +4,6 @@
 import toml
 from cx_Freeze import setup
 
-from automations.const import OS_SPECIFIC_DIR
-
 
 # <editor-fold desc="Module constants">
 PROJECT_ROOT_DIR = pathlib.Path(__file__).parent.parent.parent
@@ -51,7 +49,7 @@
       "target_name": "Open-Source-PyMOL",
       "script": pathlib.Path(PYMOL_PACKAGE_DIR / "startup_wrapper.py"),
       "base": "gui",
-      "icon": pathlib.Path(OS_SPECIFIC_DIR / "logo.png"),
+      "icon": pathlib.Path(PROJECT_ROOT_DIR / "os_specific/linux" / "logo.png"),
     }
   ],
 )
diff --git a/os_specific/macos/setup_build_exe.py b/os_specific/macos/setup_build_exe.py
@@ -4,7 +4,6 @@
 import toml
 from cx_Freeze import setup
 
-from automations.const import OS_SPECIFIC_DIR
 
 # <editor-fold desc="Module constants">
 PROJECT_ROOT_DIR = pathlib.Path(__file__).parent.parent.parent
@@ -55,7 +54,7 @@
       "target_name": "PyMOL",
       "script": pathlib.Path(PYMOL_PACKAGE_DIR / "startup_wrapper.py"),
       "base": "gui",
-      "icon": pathlib.Path(OS_SPECIFIC_DIR / "icon.icns"),
+      "icon": pathlib.Path(PROJECT_ROOT_DIR / "os_specific/macos" / "icon.icns"),
     }
   ],
 )

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`import toml`
`5`	`5`	`from cx_Freeze import setup`
`6`	`6`
`7`		`-from automations.const import OS_SPECIFIC_DIR`
`8`	`7`
`9`	`8`	`# <editor-fold desc="Module constants">`
`10`	`9`	`PROJECT_ROOT_DIR = pathlib.Path(__file__).parent.parent.parent`
`@@ -55,7 +54,7 @@`
`55`	`54`	`"target_name": "PyMOL",`
`56`	`55`	`"script": pathlib.Path(PYMOL_PACKAGE_DIR / "startup_wrapper.py"),`
`57`	`56`	`"base": "gui",`
`58`		`- "icon": pathlib.Path(OS_SPECIFIC_DIR / "icon.icns"),`
	`57`	`+ "icon": pathlib.Path(PROJECT_ROOT_DIR / "os_specific/macos" / "icon.icns"),`
`59`	`58`	`}`
`60`	`59`	`],`
`61`	`60`	`)`