diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..4de4151 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,2 @@ +recursive-include custominstall/bin/* +include custominstall/title.db.gz diff --git a/custominstall/__main__.py b/custominstall/__main__.py index 65a4daa..5a618f9 100644 --- a/custominstall/__main__.py +++ b/custominstall/__main__.py @@ -48,6 +48,12 @@ if is_windows: else: from os import statvfs +script_dir: str +if frozen: + script_dir = dirname(executable) +else: + script_dir = dirname(__file__) + # used to run the save3ds_fuse binary next to the script if 'CUSTOM_INSTALL_SAVE3DS_PATH' in environ: save3ds_fuse_path = environ['CUSTOM_INSTALL_SAVE3DS_PATH'] @@ -56,12 +62,9 @@ else: if is_windows: save3ds_fuse_name += '.exe' frozen = getattr(sys, 'frozen', False) - script_dir: str if frozen: - script_dir = dirname(executable) save3ds_fuse_path = join(script_dir, 'bin', save3ds_fuse_name) else: - script_dir = dirname(__file__) save3ds_fuse_path = join(script_dir, 'bin', platform, save3ds_fuse_name) if not isfile(save3ds_fuse_path): diff --git a/bin/Cargo.lock b/custominstall/bin/Cargo.lock similarity index 100% rename from bin/Cargo.lock rename to custominstall/bin/Cargo.lock diff --git a/bin/README b/custominstall/bin/README similarity index 100% rename from bin/README rename to custominstall/bin/README diff --git a/bin/darwin/save3ds_fuse b/custominstall/bin/darwin/save3ds_fuse similarity index 100% rename from bin/darwin/save3ds_fuse rename to custominstall/bin/darwin/save3ds_fuse diff --git a/bin/linux/put_save3ds_fuse_here b/custominstall/bin/linux/put_save3ds_fuse_here similarity index 100% rename from bin/linux/put_save3ds_fuse_here rename to custominstall/bin/linux/put_save3ds_fuse_here diff --git a/bin/win32/save3ds_fuse.exe b/custominstall/bin/win32/save3ds_fuse.exe similarity index 100% rename from bin/win32/save3ds_fuse.exe rename to custominstall/bin/win32/save3ds_fuse.exe diff --git a/title.db.gz b/custominstall/title.db.gz similarity index 100% rename from title.db.gz rename to custominstall/title.db.gz diff --git a/package.nix b/package.nix index 5cabbc5..7ea53b1 100644 --- a/package.nix +++ b/package.nix @@ -1,6 +1,7 @@ { lib, pkgs, + python, callPackage, buildPythonApplication, fetchPypi, @@ -58,8 +59,9 @@ buildPythonApplication rec { makeWrapperArgs = [ "--set CUSTOM_INSTALL_SAVE3DS_PATH ${save3ds_no_fuse}/bin/save3ds_fuse" ]; - preFixup = lib.optionalString (!withGUI) '' - rm $out/bin/custominstall-gui + preFixup = '' + rm -r $out/lib/${python.libPrefix}/site-packages/custominstall/bin + ${lib.optionalString (!withGUI) "rm $out/bin/custominstall-gui"} ''; meta = with lib; { diff --git a/pyproject.toml b/pyproject.toml index a468b99..d1cc217 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,3 +42,7 @@ version = {attr = "custominstall.__version__"} [tool.setuptools.packages] find = {namespaces = false} + +# is it even possible to make these OS-specific with pyproject.toml? +[tool.setuptools.package-data] +custominstall = ["bin/darwin/save3ds_fuse", "bin/win32/save3ds_fuse.exe"]