From c5eef49a34bc3b415158e0b440055b1870e6fa4d Mon Sep 17 00:00:00 2001
From: Christian Moser <christian@cmoser.eu>
Date: Sun, 16 Feb 2025 18:56:02 +0100
Subject: [PATCH 1/2] fixed fedora and centos install scripts

Signed-off-by: Christian Moser <christian@cmoser.eu>
---
 centos-install.sh | 14 +++++++-------
 fedora-install.sh | 14 +++++++-------
 pyproject.toml    | 17 ++++++++++++++---
 requirements.txt  |  1 +
 4 files changed, 29 insertions(+), 17 deletions(-)
 create mode 100644 requirements.txt

diff --git a/centos-install.sh b/centos-install.sh
index 8bde0d1..caf65d8 100755
--- a/centos-install.sh
+++ b/centos-install.sh
@@ -9,7 +9,7 @@ if [ ! -d "$PYTHON_VENV_DIR" ]; then
     mkdir -pv "$PYTHON_VENV_DIR"
 fi
 
-python -m venv --system-site-packages "${PYTHON_VENV_SIR}/sgbackup"
+python -m venv --system-site-packages "${PYTHON_VENV_DIR}/sgbackup"
 . "${PYTHON_VENV_DIR}/sgbackup/bin/activate"
 pip install --upgrade pip
 pip install -r "${PROJECT_ROOT}/requirements.txt"
@@ -19,7 +19,7 @@ if [ ! -d ~/.local/bin ]; then
     mkdir -pv ~/.local/bin
 fi
 
-cat > "${PYTHON_VENV_DIR}/bin/sgbackup" << EOF
+cat > "${PYTHON_VENV_DIR}/sgbackup/bin/sgbackup" << EOF
 #!/bin/bash
 
 SELF="\$(realpath "$0")"
@@ -33,10 +33,10 @@ exit_code=\$?
 deactivate
 exit \$exit_code
 EOF
-chmod +x "${PYTHON_VENV_DIR}/bin/sgbackup"
-ln -sv "${PYHTHON_VENV_DIR}/bin/sgbackup" ~/.local/bin/sgbackup
+chmod +x "${PYTHON_VENV_DIR}/sgbackup/bin/sgbackup"
+ln -sv "${PYHTHON_VENV_DIR}/sgbackup/bin/sgbackup" ~/.local/bin/sgbackup
 
-cat > "${PYTHON_VENV_DIR}/bin/gsgbackup" << EOF
+cat > "${PYTHON_VENV_DIR}/sgbackup/bin/gsgbackup" << EOF
 #!/bin/bash
 
 SELF="\$(realpath "$0")"
@@ -50,6 +50,6 @@ exit_code=\$?
 deactivate
 exit \$exit_code
 EOF
-chmod +x "${PYTHON_VENV_DIR}/bin/gsbackup"
-ln -sv "${PYTHON_VENV_DIR}/bin/gsgbackup" ~/.local/bin/gsgbackup
+chmod +x "${PYTHON_VENV_DIR}/sgbackup/bin/gsbackup"
+ln -sv "${PYTHON_VENV_DIR}/sgbackup/bin/gsgbackup" ~/.local/bin/gsgbackup
 
diff --git a/fedora-install.sh b/fedora-install.sh
index be30e15..9a8432d 100755
--- a/fedora-install.sh
+++ b/fedora-install.sh
@@ -9,7 +9,7 @@ if [ ! -d "$PYTHON_VENV_DIR" ]; then
     mkdir -pv "$PYTHON_VENV_DIR"
 fi
 
-python -m venv --system-site-packages "${PYTHON_VENV_SIR}/sgbackup"
+python -m venv --system-site-packages "${PYTHON_VENV_DIR}/sgbackup"
 . "${PYTHON_VENV_DIR}/sgbackup/bin/activate"
 pip install --upgrade pip
 pip install -r "${PROJECT_ROOT}/requirements.txt"
@@ -19,7 +19,7 @@ if [ ! -d ~/.local/bin ]; then
     mkdir -pv ~/.local/bin
 fi
 
-cat > "${PYTHON_VENV_DIR}/bin/sgbackup" << EOF
+cat > "${PYTHON_VENV_DIR}/sgbackup/bin/sgbackup" << EOF
 #!/bin/bash
 
 SELF="\$(realpath "$0")"
@@ -33,10 +33,10 @@ exit_code=\$?
 deactivate
 exit \$exit_code
 EOF
-chmod +x "${PYTHON_VENV_DIR}/bin/sgbackup"
-ln -sv "${PYHTHON_VENV_DIR}/bin/sgbackup" ~/.local/bin/sgbackup
+chmod +x "${PYTHON_VENV_DIR}/sgbackup/bin/sgbackup"
+ln -sv "${PYHTHON_VENV_DIR}/sgbackup/bin/sgbackup" ~/.local/bin/sgbackup
 
-cat > "${PYTHON_VENV_DIR}/bin/gsgbackup" << EOF
+cat > "${PYTHON_VENV_DIR}/sgbackup/bin/gsgbackup" << EOF
 #!/bin/bash
 
 SELF="\$(realpath "$0")"
@@ -50,6 +50,6 @@ exit_code=\$?
 deactivate
 exit \$exit_code
 EOF
-chmod +x "${PYTHON_VENV_DIR}/bin/gsbackup"
-ln -sv "${PYTHON_VENV_DIR}/bin/gsgbackup" ~/.local/bin/gsgbackup
+chmod +x "${PYTHON_VENV_DIR}/sgbackup/bin/gsbackup"
+ln -sv "${PYTHON_VENV_DIR}/sgbackup/bin/gsgbackup" ~/.local/bin/gsgbackup
 
diff --git a/pyproject.toml b/pyproject.toml
index 02bf8f5..4bccd00 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,15 +5,15 @@ requires = ['setuptools >= 61.0']
 [project]
 dynamic = ["version"]
 name = 'sgbackup'
-version = '0.0.0'
-requires_python = '>= 3.11'
+#version = '0.0.0'
+requires-python = '>= 3.11'
 description = 'Savegame Backup Tool'
 readme = 'README.md'
 license = {file = 'LICENSE'}
 authors = [
   {name = 'Christian Moser', email = 'christian@mydevel.at'},
 ]
-dependencies = ['gi','yaml']
+dependencies = ['PyGObject','rapidfuzz']
 
 [project.scripts]
 sgbackup = 'sgbackup:cli_main'
@@ -22,3 +22,14 @@ csgbackup = 'sgbackup:curses_main'
 [project.gui-scripts]
 gsgbackup = 'sgbackup:gui_main'
 
+[tool.setuptools]
+include-package-data = true
+
+
+[tool.setuptools.packages.find]
+where=["."]
+include=["sgbackup"]
+exclude=[".venv","sphinx","apidoc","scripts"]
+
+
+
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..ec512b4
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1 @@
+rapidfuzz

From 3c44d1c9623211ab77e948dfc5bfe50bc538517c Mon Sep 17 00:00:00 2001
From: Christian Moser <christian@cmoser.eu>
Date: Sun, 16 Feb 2025 22:45:35 +0100
Subject: [PATCH 2/2] 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"]