pyproject-appimage 4.0__tar.gz → 4.2__tar.gz

{pyproject-appimage-4.0/pyproject_appimage.egg-info → pyproject_appimage-4.2}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pyproject-appimage
-Version: 4.0
+Version: 4.2
 Summary: Generate AppImages from your Python projects
 Author-email: JakobDev <jakobdev@gmx.de>
-License: BSD-2-Clause
+License-Expression: BSD-2-Clause
 Project-URL: Downloads, https://codeberg.org/JakobDev/pyproject-appimage/releases
 Project-URL: Issues, https://codeberg.org/JakobDev/pyproject-appimage/issues
 Project-URL: Source, https://codeberg.org/JakobDev/pyproject-appimage
@@ -12,13 +12,14 @@ Keywords: JakobDev,AppImage
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Environment :: Other Environment
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Topic :: Games/Entertainment
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Python: >=3.9
@@ -27,6 +28,7 @@ License-File: LICENSE
 Requires-Dist: requests
 Requires-Dist: desktop-entry-lib
 Requires-Dist: tomli; python_version < "3.11"
+Dynamic: license-file
 
 # pyproject-appimage
 
@@ -94,7 +96,12 @@ options:
 ```
 
 ## Projects using pyproject-appimage
+* [jdMinecraftLauncher](https://codeberg.org/JakobDev/jdMinecraftLauncher)
 * [jdNBTExplorer](https://codeberg.org/JakobDev/jdNBTExplorer)
+* [jdReplace](https://codeberg.org/JakobDev/jdReplace)
+* [jdMrpackInstaller](https://codeberg.org/JakobDev/jdMrpackInstaller)
+* [jdDesktopEntryEdit](https://codeberg.org/JakobDev/jdDesktopEntryEdit)
+* [jdAppStreamEdit](https://codeberg.org/JakobDev/jdAppStreamEdit)
 
 [pyproject-appimage is of course also available as AppImage](https://codeberg.org/JakobDev/pyproject-appimage/releases/latest)
 

{pyproject-appimage-4.0 → pyproject_appimage-4.2}/README.md

@@ -64,7 +64,12 @@ options:
 ```
 
 ## Projects using pyproject-appimage
+* [jdMinecraftLauncher](https://codeberg.org/JakobDev/jdMinecraftLauncher)
 * [jdNBTExplorer](https://codeberg.org/JakobDev/jdNBTExplorer)
+* [jdReplace](https://codeberg.org/JakobDev/jdReplace)
+* [jdMrpackInstaller](https://codeberg.org/JakobDev/jdMrpackInstaller)
+* [jdDesktopEntryEdit](https://codeberg.org/JakobDev/jdDesktopEntryEdit)
+* [jdAppStreamEdit](https://codeberg.org/JakobDev/jdAppStreamEdit)
 
 [pyproject-appimage is of course also available as AppImage](https://codeberg.org/JakobDev/pyproject-appimage/releases/latest)
 

{pyproject-appimage-4.0 → pyproject_appimage-4.2}/pyproject.toml

@@ -8,7 +8,7 @@ description = "Generate AppImages from your Python projects"
 readme = "README.md"
 requires-python = ">=3.9"
 keywords = ["JakobDev", "AppImage"]
-license = { text = "BSD-2-Clause" }
+license = "BSD-2-Clause"
 authors = [
     { name = "JakobDev", email = "jakobdev@gmx.de" }
 ]
@@ -16,13 +16,14 @@ classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "Environment :: Other Environment",
-    "License :: OSI Approved :: BSD License",
     "Topic :: Games/Entertainment",
     "Operating System :: POSIX :: Linux",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3 :: Only",
     "Programming Language :: Python :: Implementation :: CPython"
 ]

{pyproject-appimage-4.0 → pyproject_appimage-4.2}/pyproject_appimage/__init__.py

@@ -5,6 +5,7 @@ import argparse
 import requests
 import platform
 import tempfile
+import pathlib
 import shutil
 import sys
 import os
@@ -122,6 +123,27 @@ def get_python_download_link(version: str) -> str:
     return None
 
 
+def get_exec_prefix(app_root: str) -> Optional[str]:
+    try:
+        result = subprocess.run([os.path.join(app_root, "usr", "bin", "python"), "-c", "import sys; print(sys.exec_prefix)"], capture_output=True, check=True)
+        return result.stdout.decode("utf-8").strip()
+    except Exception:
+        return None
+
+
+def find_script(app_root: str, name: str) -> Optional[str]:
+    usr_path = os.path.join(app_root, "usr", "bin", name)
+    if os.path.isfile(usr_path):
+        return usr_path
+
+    if (exec_prefix := get_exec_prefix(app_root)) is not None:
+        prefix_path = os.path.join(exec_prefix, "bin", name)
+        if os.path.isfile(prefix_path):
+            return prefix_path
+
+    return None
+
+
 def get_image_magick_command(work_dir: str) -> str:
     if shutil.which("magick") is not None:
         return "magick"
@@ -240,7 +262,7 @@ def build_appimage(project_dir: str, work_dir: str, pyproject: PyprojectDict, ar
     if args.appimagekit_url:
         download_file(args.appimagekit_url, os.path.join(work_dir, "Appimagetool.AppImage"))
     else:
-        download_file("https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage", os.path.join(work_dir, "Appimagetool.AppImage"))
+        download_file("https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage", os.path.join(work_dir, "Appimagetool.AppImage"))
 
     subprocess.run(["chmod", "+x", os.path.join(work_dir, "Python.AppImage")], check=True)
     subprocess.run(["chmod", "+x", os.path.join(work_dir, "Appimagetool.AppImage")], check=True)
@@ -257,11 +279,18 @@ def build_appimage(project_dir: str, work_dir: str, pyproject: PyprojectDict, ar
 
     subprocess.run([os.path.join(app_root, "usr", "bin", "pip"), "install", "--no-warn-script-location", project_dir], check=True)
 
-    if not os.path.isfile(os.path.join(app_root, "usr", "bin", pyproject["script"])):
-        print("The script " + pyproject["script"] + " as not found")
+    script_path = find_script(app_root, pyproject["script"])
+    if script_path is None:
+        print("The script " + pyproject["script"] + " was not found")
         sys.exit(1)
 
-    os.symlink(os.path.join("usr", "bin", pyproject["script"]), os.path.join(app_root, "AppRun"))
+    app_run = os.path.join(app_root, "AppRun")
+
+    with open(app_run, "w", encoding="utf-8") as f:
+        f.write("#!/bin/sh\n")
+        f.write('exec "${APPDIR}/usr/bin/python" "${APPDIR}/' + str(pathlib.Path(script_path).relative_to(app_root)) + '" "$@"\n')
+
+    subprocess.run(["chmod", "+x", app_run], check=True)
 
     handle_icon(project_dir, work_dir, app_root, pyproject)
 

pyproject_appimage-4.2/pyproject_appimage/version.txt

@@ -0,0 +1 @@
+4.2

{pyproject-appimage-4.0 → pyproject_appimage-4.2/pyproject_appimage.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pyproject-appimage
-Version: 4.0
+Version: 4.2
 Summary: Generate AppImages from your Python projects
 Author-email: JakobDev <jakobdev@gmx.de>
-License: BSD-2-Clause
+License-Expression: BSD-2-Clause
 Project-URL: Downloads, https://codeberg.org/JakobDev/pyproject-appimage/releases
 Project-URL: Issues, https://codeberg.org/JakobDev/pyproject-appimage/issues
 Project-URL: Source, https://codeberg.org/JakobDev/pyproject-appimage
@@ -12,13 +12,14 @@ Keywords: JakobDev,AppImage
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Environment :: Other Environment
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Topic :: Games/Entertainment
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Python: >=3.9
@@ -27,6 +28,7 @@ License-File: LICENSE
 Requires-Dist: requests
 Requires-Dist: desktop-entry-lib
 Requires-Dist: tomli; python_version < "3.11"
+Dynamic: license-file
 
 # pyproject-appimage
 
@@ -94,7 +96,12 @@ options:
 ```
 
 ## Projects using pyproject-appimage
+* [jdMinecraftLauncher](https://codeberg.org/JakobDev/jdMinecraftLauncher)
 * [jdNBTExplorer](https://codeberg.org/JakobDev/jdNBTExplorer)
+* [jdReplace](https://codeberg.org/JakobDev/jdReplace)
+* [jdMrpackInstaller](https://codeberg.org/JakobDev/jdMrpackInstaller)
+* [jdDesktopEntryEdit](https://codeberg.org/JakobDev/jdDesktopEntryEdit)
+* [jdAppStreamEdit](https://codeberg.org/JakobDev/jdAppStreamEdit)
 
 [pyproject-appimage is of course also available as AppImage](https://codeberg.org/JakobDev/pyproject-appimage/releases/latest)
 

pyproject-appimage-4.0/pyproject_appimage/version.txt

@@ -1 +0,0 @@
-4.0