diff --git a/PKGBUILD b/PKGBUILD index c08b160..d9872e8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,15 +10,14 @@ arch=('any') url="https://github.com/Fuxino/simple_backup.git" license=('GPL3') makedepends=('git' - 'python-setuptools' - 'python-build' - 'python-installer' - 'python-wheel') + 'python-setuptools' + 'python-build' + 'python-installer' + 'python-wheel') depends=('python' 'rsync' - 'python-dotenv' - 'python-dbus' - 'python-systemd') + 'python-dotenv') +optdepends=('python-systemd: use systemd log') install=${pkgname}.install source=(git+https://github.com/Fuxino/${pkgname}.git) sha256sums=('SKIP') diff --git a/README.md b/README.md index 7646fb9..d4d136d 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,8 @@ A simple backup script ## Description simple_backup is a Python script that allows you to backup your files. -Parameters like input files/directories, output directory etc. can be specified in a configuration file, or on the command line. Run: +Parameters like input files/directories, output directory etc. can be specified in a configuration file, or on the command line. +Run: ```bash simple_backup -h @@ -35,3 +36,5 @@ python -m installer dist/*.whl For Arch Linux, a PKGBUILD that automates this process is provided. +After installing, copy simple_backup.conf (if you used the PKGBUILD on Arch, it will be in /etc/simple_backup/) to $HOME/.config/simple_backup and edit is as needed. + diff --git a/simple_backup/simple_backup.py b/simple_backup/simple_backup.py index 0d006a7..b7d7111 100755 --- a/simple_backup/simple_backup.py +++ b/simple_backup/simple_backup.py @@ -12,7 +12,6 @@ from timeit import default_timer from subprocess import Popen, PIPE, STDOUT from datetime import datetime from tempfile import mkstemp -import dbus from dotenv import load_dotenv try: @@ -236,10 +235,6 @@ class Backup: if self._err_flag: logger.warning('Some errors occurred (check log for details)') - return 1 - - return 0 - def _parse_arguments(): parser = argparse.ArgumentParser(prog='simple_backup', @@ -304,21 +299,7 @@ def simple_backup(): backup = Backup(inputs, output, exclude, keep, backup_options) if backup.check_params(): - try: - obj = dbus.SessionBus().get_object("org.freedesktop.Notifications", "/org/freedesktop/Notifications") - obj = dbus.Interface(obj, "org.freedesktop.Notifications") - obj.Notify("simple_backup", 0, "", "Starting backup...", "", [], {"urgency": 1}, 10000) - except dbus.exceptions.DBusException: - obj = None - - status = backup.run() - - if obj is not None: - if status == 0: - obj.Notify("simple_backup", 0, "", "Backup finished.", "", [], {"urgency": 1}, 10000) - else: - obj.Notify("simple_backup", 0, "", "Backup finished. Some errors occurred.", - "", [], {"urgency": 1}, 10000) + backup.run() return 0