From 3c44d1c9623211ab77e948dfc5bfe50bc538517c Mon Sep 17 00:00:00 2001 From: Christian Moser Date: Sun, 16 Feb 2025 22:45:35 +0100 Subject: [PATCH] 2025.02.16 22:45:35 (centos.cmoser.eu) --- centos-install.sh | 18 ++++++++++-------- fedora-install.sh | 14 +++++++------- pyproject.toml | 14 +++++++------- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/centos-install.sh b/centos-install.sh index caf65d8..dda80db 100755 --- a/centos-install.sh +++ b/centos-install.sh @@ -22,29 +22,31 @@ fi cat > "${PYTHON_VENV_DIR}/sgbackup/bin/sgbackup" << EOF #!/bin/bash -SELF="\$(realpath "$0")" -VENV_BINDR="\$(dirname "\$SELF")" - +SELF="\$(realpath "\$0")" +echo \$SELF +VENV_BINDIR="\$(dirname "\$SELF")" +echo \$VENV_BINDIR . "\$VENV_BINDIR/activate" -python -m sgbackup +echo "\$@" +python -m sgbackup "\$@" exit_code=\$? deactivate exit \$exit_code EOF chmod +x "${PYTHON_VENV_DIR}/sgbackup/bin/sgbackup" -ln -sv "${PYHTHON_VENV_DIR}/sgbackup/bin/sgbackup" ~/.local/bin/sgbackup +ln -sv "${PYTHON_VENV_DIR}/sgbackup/bin/sgbackup" ~/.local/bin/sgbackup cat > "${PYTHON_VENV_DIR}/sgbackup/bin/gsgbackup" << EOF #!/bin/bash -SELF="\$(realpath "$0")" -VENV_BINDR="\$(dirname "\$SELF")" +SELF="\$(realpath "\$0")" +VENV_BINDIR="\$(dirname "\$SELF")" . "\$VENV_BINDIR/activate" -python -m sgbackup.gui +python -m sgbackup.gui "\$@" exit_code=\$? deactivate diff --git a/fedora-install.sh b/fedora-install.sh index 9a8432d..4f11e54 100755 --- a/fedora-install.sh +++ b/fedora-install.sh @@ -22,29 +22,29 @@ fi cat > "${PYTHON_VENV_DIR}/sgbackup/bin/sgbackup" << EOF #!/bin/bash -SELF="\$(realpath "$0")" -VENV_BINDR="\$(dirname "\$SELF")" +SELF="\$(realpath "\$0")" +VENV_BINDIR="\$(dirname "\$SELF")" . "\$VENV_BINDIR/activate" -python -m sgbackup +python -m sgbackup "\$@" exit_code=\$? deactivate exit \$exit_code EOF chmod +x "${PYTHON_VENV_DIR}/sgbackup/bin/sgbackup" -ln -sv "${PYHTHON_VENV_DIR}/sgbackup/bin/sgbackup" ~/.local/bin/sgbackup +ln -sv "${PYTHON_VENV_DIR}/sgbackup/bin/sgbackup" ~/.local/bin/sgbackup cat > "${PYTHON_VENV_DIR}/sgbackup/bin/gsgbackup" << EOF #!/bin/bash -SELF="\$(realpath "$0")" -VENV_BINDR="\$(dirname "\$SELF")" +SELF="\$(realpath "\$0")" +VENV_BINDIR="\$(dirname "\$SELF")" . "\$VENV_BINDIR/activate" -python -m sgbackup.gui +python -m sgbackup.gui "\$@" exit_code=\$? deactivate diff --git a/pyproject.toml b/pyproject.toml index 4bccd00..2443edd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,12 +24,12 @@ gsgbackup = 'sgbackup:gui_main' [tool.setuptools] include-package-data = true +packages = ["sgbackup","sgbackup.archiver","sgbackup.commands","sgbackup.gui"] +package-data = {"sgbackup"=["sgbackup/icons/*.ico","sgbackup/icons/hicolor/*/*/*","sgbackup/icons/hicolor/*/*/*/*"]} - -[tool.setuptools.packages.find] -where=["."] -include=["sgbackup"] -exclude=[".venv","sphinx","apidoc","scripts"] - - +#[tool.setuptools.packages.find] +#namespaces = false +#where = ["."] +#include = [] +#exclude = [".venv","sphinx","apidoc","scripts"]