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