PKGBUILD

@@ -1,40 +0,0 @@
-# PKGBUILD
-
-# Maintainer: Daniele Fucini <dfucini [at] gmail [dot] com>
-
-pkgname=simple_backup
-pkgdesc='Simple backup script that uses rsync to copy files'
-pkgver=4.1.6
-pkgrel=1
-url="https://git.shouldnt.work/fuxino/${pkgname}"
-arch=('any')
-license=('GPL-3.0-or-later')
-makedepends=('git'
-             'python-setuptools'
-             'python-build'
-             'python-installer'
-             'python-wheel')
-depends=('python>=3.10'
-         'rsync'
-         'python-dotenv')
-optdepends=('python-systemd: use systemd log'
-            'python-dbus: for desktop notifications'
-            'python-paramiko: for remote backup through ssh')
-conflicts=('simple_backup-git')
-source=(git+${url}?signed#tag=${pkgver})
-validpgpkeys=('7E12BC1FF3B6EDB2CD8053EB981A2B2A3BBF5514')
-sha256sums=('b3b29d9e2e1b7b949e95674d9a401e8eeb0d5f898e8450473dce94f799ee9df3')
-
-build()
-{
-    cd ${srcdir}/${pkgname}
-    python -m build --wheel --no-isolation
-}
-
-package()
-{
-    cd ${srcdir}/${pkgname}
-    python -m installer --destdir=${pkgdir} dist/*.whl
-    install -Dm644 ${pkgname}/${pkgname}.conf ${pkgdir}/usr/share/doc/${pkgname}/${pkgname}.conf
-    install -Dm644 man/${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1
-}

README.md

@@ -68,4 +68,4 @@ sudo --preserve-env=SSH_AUTH_SOCK -s simple_backup [options]
 
 or by editing the sudoers file.
 If SSH key authentication is not available, password authentication will be used instead.
-Check the man page for more details.
+

man/simple_backup.1

@@ -1,4 +1,4 @@
-.TH SIMPLE_BACKUP 1 2025-03-30 SIMPLE_BACKUP 4.1.6
+.TH SIMPLE_BACKUP 1 2023-06-15 SIMPLE_BACKUP 3.2.6
 .SH NAME
 simple_backup \- Backup files and folders using rsync
 .SH SYNOPSIS
@@ -39,7 +39,7 @@ Parameters specified on the command line will override those in the configuratio
 .SH OPTIONS
 .TP
 .B \-h, \-\-help
-Print a short help message and exit.
+Print a short help message and exit
 .TP
 .B \-c, \-\-config FILE
 Specify the configuration file, useful to specify a different one from the default.
@@ -52,24 +52,21 @@ or to use single or double quotes around them.
 .B \-o, \-\-output DIR
 Specify the directory where the files will be copied. The program will automatically
 create a subdirectory called \(aqsimple_backup\(aq (if it does not already exist) and
-inside this directory the actual backup directory (using the current date and time).
+inside this directory the actual backup directory (using the current date and time)
 .TP
 .B \-e, \-\-exclude FILE|DIR|PATTERN [FILE|...]]
 Specify files, directories or patterns to exclude from the backup. Matching files and directories
-will not be copied. Multiple elements can be specified, in the same way as for the \-\-input option.
+will not be copied. Multiple elements can be specified, in the same way as for the \-\-input option
 .TP
 .B \-k, \-\-keep N
 Specify how many old backups (so excluding the current one) will be kept. The default behavior
-is to keep them all (same as N=\-1).
+is to keep them all (same as N=\-1)
-.TP
-.B \-u, \-\-user USERNAME
-Explicitly specify the user running the backup (in case it is needed for home directory expansion).
 .TP
 .B \-\-ssh\-host HOSTNAME
-Hostname of the server where to copy the files in case of remote backup through SSH.
+Hostname of the server where to copy the files in case of remote backup through SSH
 .TP
 .B \-\-ssh\-user USERNAME
-Username for connecting to the server in case of remote backup.
+Username for connecting to the server in case of remote backup
 .TP
 .B \-\-keyfile FILE
 Location of the SSH key for server authentication. 
@@ -88,24 +85,24 @@ before performing the backup.
 Default behavior is to remove old backups after successfully completing the backup.
 .TP
 .B \-\-no\-syslog
-Don't use systemd journal for logging.
+Don't use systemd journal for logging
 .TP
 .B \-\-rsync\-options OPTIONS [OPTION...]
 By default, the following rsync options are used:
 .RS
-.P
+.PP
     \-a \-r \-v \-h \-s \-H \-X
-.P
+.PP
 Using \-\-rsync\-options it is possible to manually select which options to use. Supported values are the following:
-.P
+.PP
     \-a, \-l, \-p, \-t, \-g, \-o, \-c, \-h, \-D, \-H, \-X, \-s
-.P
+.PP
 Options \-r and \-v are used in any case. Not that options must be specified without dash (\-), for example:
-.P
+.PP
 .EX
     simple_backup \-\-rsync\-options a l p
 .EE
-.P
+.TP
 Check
 .BR rsync (1)
 for details about the options.
@@ -114,16 +111,12 @@ for details about the options.
 .B \-\-remote\-sudo
 Run rsync on the remote server with sudo. This is needed if you want to preserve the owner of the files/folders to be copied (rsync \-\-owner option). For this to work the user used to login to the server obviously need to be allowed to use sudo. In addition, the user need to be able to run rsync with sudo without a password. To do this, /etc/sudoers on the server need to be edited adding a line like this one:
 .RS
-.P
+.PP
     <username> ALL=NOPASSWD:<path/to/rsync>
-.P
-To be able to remove old backups generated with \-\-remote\-sudo (see \-\-keep option), also
-.BR rm (1)
-needs to be allowed to run without password in the same way.
 .RE
 .TP
 .B \-\-numeric\-ids
-Use rsync \-\-numeric\-ids option. This causes rsync to use numeric uid/gid instead of trying to map uid/gid names from the local machine to the server.
+Use rsync \-\-numeric\-ids option. This causes rsync to use numeric uid/gid instead of trying to map uid/gid names from the local machine to the server
 .SH CONFIGURATION
 An example configuration file is provided at \(aq/usr/share/doc/simple_backup/simple_backup.conf\(aq.
 Copy it to the default location ($HOME/.config/simple_backup) and edit it as needed.
@@ -143,7 +136,7 @@ When running
 .B simple_backup
 with
 .B sudo,
-in order to connect to the user\(aqs SSH agent it is necessary to preserve the \(aqSSH_AUTH_SOCK\(aq environment variable, for example:
+in order to connect to the user\(aq s SSH agent it is necessary to preserve the \(aq SSH_AUTH_SOCK\(aq environment variable, for example:
 .P
 .EX
     sudo --preserve-env=SSH_AUTH_SOCK -s simple_backup [options]
@@ -152,7 +145,8 @@ in order to connect to the user\(aqs SSH agent it is necessary to preserve the \
 It is also possible to make this permanent by editing the
 .B sudoers
 file (see
-.BR sudoers (5))
+.BR sudoers (5)
+)
 .P
 If SSH key authentication is not available, password authentication will be used instead.
 Note that in this case
@@ -165,28 +159,28 @@ for details. For this reason, use SSH key authentication if possible.
 .SH EXIT STATUS
 .TP
 .B 0
-The backup was completed without errors.
+The backup was completed without errors
 .TP
 .B 1
-No valid inputs selected for backup.
+No valid inputs selected for backup
 .TP
 .B 2
-Backup failed because output directory for storing the backup does not exist.
+Backup failed because output directory for storing the backup does not exist
 .TP
 .B 3
-Permission denied to access the output directory.
+Permission denied to access the output directory
 .TP
 .B 4
-rsync error (rsync returned a non-zero value).
+rsync error (rsync returned a non-zero value)
 .TP
 .B 5
-SSH connection failed.
+SSH connection failed
 .TP
 .B 6
-Bad configuration file.
+Bad configuration file
 .SH SEE ALSO
 .BR rsync (1)
 .SH AUTHORS
-.MT https://git.shouldnt.work/fuxino
+.MT https://github.com/Fuxino
 Daniele Fucini
 .ME

setup.cfg

@@ -6,22 +6,23 @@ long_description = file: README.md
 author = Daniele Fucini
 author_email = dfucini@gmail.com
 license = GPL3
-url = https://git.shouldnt.work/fuxino
+url = https://github.com/Fuxino/simple_backup
 classifiers =
    Development Status :: 4 - Beta
    Environment :: Console
    License :: OSI Approved :: GNU General Public License v3 (GPLv3)
    Natural Language :: English
    Operating System :: POSIX :: Linux
+   Programming Language :: Python :: 3.7
+   Programming Language :: Python :: 3.8
+   Programming Language :: Python :: 3.9
    Programming Language :: Python :: 3.10
    Programming Language :: Python :: 3.11
-   Programming Language :: Python :: 3.12
-   Programming Language :: Python :: 3.13
    Topic :: System :: Archiving :: Backup
 
 [options]
 packages = simple_backup
-python_requires = >=3.10
+python_requires = >=3.7
 install_requires =
    python-dotenv
 

simple_backup/__init__.py

@@ -1,3 +1,3 @@
 """Init."""
 
-__version__ = '4.1.6'
+__version__ = '4.0.0'

simple_backup/simple_backup.conf

@@ -2,7 +2,7 @@
 
 [backup]
 # Files and directories to backup. Multiple items can be separated using a comma (','). It is possible to use wildcards (i.e. '*' to match multiple characters and '~' for the user's home directory).
-inputs=/home/user
+inputs=/home/my_home,/etc
 
 # Output directory.
 backup_dir=/media/Backup

simple_backup/simple_backup.py

@@ -14,7 +14,6 @@ Classes:
 # Import libraries
 import sys
 import os
-from typing import Callable, List, Optional, ParamSpec, TypeVar, Union
 import warnings
 from functools import wraps
 from shutil import rmtree, which
@@ -27,7 +26,7 @@ from timeit import default_timer
 from subprocess import Popen, PIPE, STDOUT
 from datetime import datetime
 from tempfile import mkstemp
-from getpass import GetPassWarning, getpass
+from getpass import getpass
 from glob import glob
 
 from dotenv import load_dotenv
@@ -52,6 +51,15 @@ except ImportError:
 
 
 load_dotenv()
+euid = os.geteuid()
+
+if euid == 0:
+    user = os.getenv('SUDO_USER')
+    homedir = os.path.expanduser(f'~{user}')
+else:
+    user = os.getenv('USER')
+    homedir = os.getenv('HOME')
+
 logging.getLogger().setLevel(logging.DEBUG)
 logger = logging.getLogger(os.path.basename(__file__))
 c_handler = StreamHandler()
@@ -68,29 +76,29 @@ if journal:
     j_handler.setFormatter(j_format)
     logger.addHandler(j_handler)
 
-P = ParamSpec('P')
-R = TypeVar('R')
 
-
+def timing(_logger):
-def timing(func: Callable[P, R]) -> Callable[P, R]:
     """Decorator to measure execution time of a function
 
         Parameters:
-            func: Function to decorate
+            _logger: Logger object
     """
-    @wraps(func)
+    def decorator_timing(func):
-    def wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
+        @wraps(func)
-        start = default_timer()
+        def wrapper_timing(*args, **kwargs):
+            start = default_timer()
 
-        value = func(*args, **kwargs)
+            value = func(*args, **kwargs)
 
-        end = default_timer()
+            end = default_timer()
 
-        logger.info('Elapsed time: %.3f seconds', end - start)
+            _logger.info(f'Elapsed time: {end - start:.3f} seconds')
 
-        return value
+            return value
 
-    return wrapper
+        return wrapper_timing
+
+    return decorator_timing
 
 
 class MyFormatter(argparse.RawTextHelpFormatter, argparse.ArgumentDefaultsHelpFormatter):
@@ -135,9 +143,8 @@ class Backup:
             Perform the backup
     """
 
-    def __init__(self, inputs: List[str], output: str, exclude: List[str], keep: int, options: str,
+    def __init__(self, inputs, output, exclude, keep, options, ssh_host=None, ssh_user=None,
-                 ssh_host: Optional[str] = None, ssh_user: Optional[str] = None, ssh_keyfile: Optional[str] = None,
+                 ssh_keyfile=None, remote_sudo=False, remove_before=False):
-                 remote_sudo: bool = False, remove_before: bool = False, verbose: bool = False) -> None:
         self.inputs = inputs
         self.output = output
         self.exclude = exclude
@@ -148,29 +155,27 @@ class Backup:
         self.ssh_keyfile = ssh_keyfile
         self.remote_sudo = remote_sudo
         self._remove_before = remove_before
-        self._verbose = verbose
         self._last_backup = ''
         self._server = ''
         self._output_dir = ''
         self._inputs_path = ''
         self._exclude_path = ''
-        self._remote = False
+        self._remote = None
+        self._err_flag = False
         self._ssh = None
         self._password_auth = False
         self._password = None
 
-    def check_params(self, homedir: str = '') -> int:
+    def check_params(self):
         """Check if parameters for the backup are valid"""
 
         if self.inputs is None or len(self.inputs) == 0:
-            logger.info(
+            logger.info('No existing files or directories specified for backup. Nothing to do')
-                'No existing files or directories specified for backup. Nothing to do')
 
             return 1
 
         if self.output is None:
-            logger.critical(
+            logger.critical('No output path specified. Use -o argument or specify output path in configuration file')
-                'No output path specified. Use -o argument or specify output path in configuration file')
 
             return 2
 
@@ -178,13 +183,12 @@ class Backup:
             self._remote = True
 
         if self._remote:
-            self._ssh = self._ssh_connect(homedir)
+            self._ssh = self._ssh_connect()
 
             if self._ssh is None:
-                return 5
+                sys.exit(5)
 
-            _, stdout, _ = self._ssh.exec_command(
+            _, stdout, _ = self._ssh.exec_command(f'if [ -d "{self.output}" ]; then echo "ok"; fi')
-                f'if [ -d "{self.output}" ]; then echo "ok"; fi')
 
             output = stdout.read().decode('utf-8').strip()
 
@@ -206,7 +210,7 @@ class Backup:
         return 0
 
     # Function to create the actual backup directory
-    def define_backup_dir(self) -> None:
+    def define_backup_dir(self):
         """Define the actual backup dir"""
         now = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
         self._output_dir = f'{self.output}/simple_backup/{now}'
@@ -214,14 +218,11 @@ class Backup:
         if self._remote:
             self._server = f'{self.ssh_user}@{self.ssh_host}:'
 
-    def remove_old_backups(self) -> None:
+    def remove_old_backups(self):
         """Remove old backups if there are more than indicated by 'keep'"""
 
         if self._remote:
-            assert self._ssh is not None
+            _, stdout, _ = self._ssh.exec_command(f'ls {self.output}/simple_backup')
-
-            _, stdout, _ = self._ssh.exec_command(
-                f'ls {self.output}/simple_backup')
 
             dirs = stdout.read().decode('utf-8').strip().split('\n')
 
@@ -237,18 +238,12 @@ class Backup:
                 dirs.sort()
 
                 for i in range(n_backup - self.keep):
-                    if self.remote_sudo:
+                    _, _, stderr = self._ssh.exec_command(f'rm -r "{self.output}/simple_backup/{dirs[i]}"')
-                        _, _, stderr = self._ssh.exec_command(
-                            f'sudo rm -r "{self.output}/simple_backup/{dirs[i]}"')
-                    else:
-                        _, _, stderr = self._ssh.exec_command(
-                            f'rm -r "{self.output}/simple_backup/{dirs[i]}"')
 
                     err = stderr.read().decode('utf-8').strip().split('\n')[0]
 
                     if err != '':
-                        logger.error(
+                        logger.error('Error while removing backup %s.', {dirs[i]})
-                            'Error while removing backup %s.', {dirs[i]})
                         logger.error(err)
                     else:
                         count += 1
@@ -274,18 +269,16 @@ class Backup:
                         rmtree(f'{self.output}/simple_backup/{dirs[i]}')
                         count += 1
                     except FileNotFoundError:
-                        logger.error(
+                        logger.error('Error while removing backup %s. Directory not found', dirs[i])
-                            'Error while removing backup %s. Directory not found', dirs[i])
                     except PermissionError:
-                        logger.error(
+                        logger.error('Error while removing backup %s. Permission denied', dirs[i])
-                            'Error while removing backup %s. Permission denied', dirs[i])
 
         if count == 1:
             logger.info('Removed %d backup', count)
         elif count > 1:
             logger.info('Removed %d backups', count)
 
-    def find_last_backup(self) -> None:
+    def find_last_backup(self):
         """Get path of last backup (from last_backup symlink) for rsync --link-dest"""
 
         if self._remote:
@@ -293,8 +286,7 @@ class Backup:
                 logger.critical('SSH connection to server failed')
                 sys.exit(5)
 
-            _, stdout, _ = self._ssh.exec_command(
+            _, stdout, _ = self._ssh.exec_command(f'find {self.output}/simple_backup/ -mindepth 1 -maxdepth 1 -type d | sort')
-                f'find {self.output}/simple_backup/ -mindepth 1 -maxdepth 1 -type d | sort')
             output = stdout.read().decode('utf-8').strip().split('\n')
 
             if output[-1] != '':
@@ -303,18 +295,16 @@ class Backup:
                 logger.info('No previous backups available')
         else:
             try:
-                dirs = sorted([f.path for f in os.scandir(
+                dirs = sorted([f.path for f in os.scandir(f'{self.output}/simple_backup') if f.is_dir(follow_symlinks=False)])
-                    f'{self.output}/simple_backup') if f.is_dir(follow_symlinks=False)])
             except FileNotFoundError:
                 logger.info('No previous backups available')
 
                 return
             except PermissionError:
-                logger.critical(
+                logger.critical('Cannot access the backup directory. Permission denied')
-                    'Cannot access the backup directory. Permission denied')
 
                 try:
-                    _notify('Backup failed (check log for details)')
+                    notify('Backup failed (check log for details)')
                 except NameError:
                     pass
 
@@ -325,18 +315,17 @@ class Backup:
             except IndexError:
                 logger.info('No previous backups available')
 
-    def _ssh_connect(self, homedir: str = '') -> paramiko.client.SSHClient:
+    def _ssh_connect(self):
         try:
             ssh = paramiko.SSHClient()
         except NameError:
             logger.error('Install paramiko for ssh support')
-
             return None
 
         try:
             ssh.load_host_keys(filename=f'{homedir}/.ssh/known_hosts')
         except FileNotFoundError:
-            logger.warning('Cannot find file %s/.ssh/known_hosts', homedir)
+            logger.warning(f'Cannot find file {homedir}/.ssh/known_hosts')
 
         ssh.set_missing_host_key_policy(paramiko.WarningPolicy())
 
@@ -345,8 +334,7 @@ class Backup:
 
             return ssh
         except UserWarning:
-            k = input(
+            k = input(f'Unknown key for host {self.ssh_host}. Continue anyway? (Y/N) ')
-                f'Unknown key for host {self.ssh_host}. Continue anyway? (Y/N) ')
 
             if k[0].upper() == 'Y':
                 ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
@@ -369,20 +357,13 @@ class Backup:
 
         if self.ssh_keyfile is None:
             try:
-                password = getpass(
+                password = getpass(f'{self.ssh_user}@{self.ssh_host}\'s password: ')
-                    f'{self.ssh_user}@{self.ssh_host}\'s password: ')
+                ssh.connect(self.ssh_host, username=self.ssh_user, password=password)
-                ssh.connect(self.ssh_host, username=self.ssh_user,
-                            password=password)
 
                 self._password_auth = True
                 os.environ['SSHPASS'] = password
 
                 return ssh
-            except GetPassWarning as e:
-                logger.critical('Unable to get password')
-                logger.critical(e)
-
-                return None
             except paramiko.SSHException as e:
                 logger.critical('Can\'t connect to the server.')
                 logger.critical(e)
@@ -394,8 +375,7 @@ class Backup:
         try:
             pkey = RSAKey.from_private_key_file(self.ssh_keyfile)
         except paramiko.PasswordRequiredException:
-            password = getpass(
+            password = getpass(f'Enter passwphrase for key \'{self.ssh_keyfile}\': ')
-                f'Enter passwphrase for key \'{self.ssh_keyfile}\': ')
 
             try:
                 pkey = RSAKey.from_private_key_file(self.ssh_keyfile, password)
@@ -407,8 +387,7 @@ class Backup:
                 pkey = Ed25519Key.from_private_key_file(self.ssh_keyfile)
             except paramiko.PasswordRequiredException:
                 try:
-                    pkey = Ed25519Key.from_private_key_file(
+                    pkey = Ed25519Key.from_private_key_file(self.ssh_keyfile, password)
-                        self.ssh_keyfile, password)
                 except paramiko.SSHException:
                     pass
 
@@ -417,8 +396,7 @@ class Backup:
                 pkey = ECDSAKey.from_private_key_file(self.ssh_keyfile)
             except paramiko.PasswordRequiredException:
                 try:
-                    pkey = ECDSAKey.from_private_key_file(
+                    pkey = ECDSAKey.from_private_key_file(self.ssh_keyfile, password)
-                        self.ssh_keyfile, password)
                 except paramiko.SSHException:
                     pass
 
@@ -427,8 +405,7 @@ class Backup:
                 pkey = DSSKey.from_private_key_file(self.ssh_keyfile)
             except paramiko.PasswordRequiredException:
                 try:
-                    pkey = DSSKey.from_private_key_file(
+                    pkey = DSSKey.from_private_key_file(self.ssh_keyfile, password)
-                        self.ssh_keyfile, password)
                 except paramiko.SSHException:
                     pass
 
@@ -441,51 +418,9 @@ class Backup:
 
         return ssh
 
-    def _returncode_log(self, returncode: int) -> None:
-        match returncode:
-            case 2:
-                logger.error(
-                    'Rsync error (return code 2) - Protocol incompatibility')
-            case 3:
-                logger.error(
-                    'Rsync error (return code 3) - Errors selecting input/output files, dirs')
-            case 4:
-                logger.error(
-                    'Rsync error (return code 4) - Requested action not supported')
-            case 5:
-                logger.error(
-                    'Rsync error (return code 5) - Error starting client-server protocol')
-            case 10:
-                logger.error(
-                    'Rsync error (return code 10) - Error in socket I/O')
-            case 11:
-                logger.error(
-                    'Rsync error (return code 11) - Error in file I/O')
-            case 12:
-                logger.error(
-                    'Rsync error (return code 12) - Error in rsync protocol data stream')
-            case 22:
-                logger.error(
-                    'Rsync error (return code 22) - Error allocating core memory buffers')
-            case 23:
-                logger.warning(
-                    'Rsync error (return code 23) - Partial transfer due to error')
-            case 24:
-                logger.warning(
-                    'Rsync error (return code 24) - Partial transfer due to vanished source files')
-            case 30:
-                logger.error(
-                    'Rsync error (return code 30) - Timeout in data send/receive')
-            case 35:
-                logger.error(
-                    'Rsync error (return code 35) - Timeout waiting for daemon connection')
-            case _:
-                logger.error(
-                    'Rsync error (return code %d) - Check rsync(1) for details', returncode)
-
     # Function to read configuration file
-    @timing
+    @timing(logger)
-    def run(self) -> int:
+    def run(self):
         """Perform the backup"""
 
         logger.info('Starting backup...')
@@ -511,11 +446,10 @@ class Backup:
                     count += 1
 
         if count == 0:
-            logger.info(
+            logger.info('No existing files or directories specified for backup. Nothing to do')
-                'No existing files or directories specified for backup. Nothing to do')
 
             try:
-                _notify('Backup finished. No files copied')
+                notify('Backup finished. No files copied')
             except NameError:
                 pass
 
@@ -536,12 +470,10 @@ class Backup:
 
         if self._last_backup == '':
             rsync = f'/usr/bin/rsync {self.options} --exclude-from={self._exclude_path} ' +\
-                f'--files-from={self._inputs_path} / "{self._server}{self._output_dir}"'
+                    f'--files-from={self._inputs_path} / "{self._server}{self._output_dir}"'
         else:
             rsync = f'/usr/bin/rsync {self.options} --link-dest="{self._last_backup}" --exclude-from=' +\
-                f'{self._exclude_path} --files-from={self._inputs_path} / "{self._server}{self._output_dir}"'
+                    f'{self._exclude_path} --files-from={self._inputs_path} / "{self._server}{self._output_dir}"'
-
-        euid = os.geteuid()
 
         if euid == 0 and self.ssh_keyfile is not None:
             rsync = f'{rsync} -e \'ssh -i {self.ssh_keyfile} -o StrictHostKeyChecking=no\''
@@ -556,7 +488,6 @@ class Backup:
         args = shlex.split(rsync)
 
         with Popen(args, stdin=PIPE, stdout=PIPE, stderr=STDOUT, shell=False) as p:
-            output: Union[bytes, List[str]]
             output, _ = p.communicate()
 
             try:
@@ -564,24 +495,16 @@ class Backup:
             except KeyError:
                 pass
 
-            returncode = p.returncode
+            if p.returncode != 0:
+                self._err_flag = True
 
         output = output.decode("utf-8").split('\n')
 
-        if returncode == 0:
+        if self._err_flag:
-            if self._verbose:
+            logger.error('rsync: %s', output)
-                logger.info('rsync: %s', output)
-            else:
-                logger.info('rsync: %s', output[-3])
-                logger.info('rsync: %s', output[-2])
         else:
-            self._returncode_log(returncode)
+            logger.info('rsync: %s', output[-3])
-
+            logger.info('rsync: %s', output[-2])
-            if self._verbose:
-                if returncode in [23, 24]:
-                    logger.warning(output)
-                else:
-                    logger.error(output)
 
         if self.keep != -1 and not self._remove_before:
             self.remove_old_backups()
@@ -590,10 +513,7 @@ class Backup:
         os.remove(self._exclude_path)
 
         if self._remote:
-            assert self._ssh is not None
+            _, stdout, _ = self._ssh.exec_command(f'if [ -d "{self._output_dir}" ]; then echo "ok"; fi')
-
-            _, stdout, _ = self._ssh.exec_command(
-                f'if [ -d "{self._output_dir}" ]; then echo "ok"; fi')
 
             output = stdout.read().decode('utf-8').strip()
 
@@ -615,76 +535,51 @@ class Backup:
             if self._ssh:
                 self._ssh.close()
         else:
-            if returncode != 0:
+            if self._err_flag:
-                logger.error(
+                logger.error('Some errors occurred while performing the backup')
-                    'Some errors occurred while performing the backup')
 
                 try:
-                    _notify(
+                    _notify('Some errors occurred while performing the backup. Check log for details')
-                        'Some errors occurred while performing the backup. Check log for details')
                 except NameError:
                     pass
 
                 return 4
+            else:
+                logger.info('Backup completed')
 
-            logger.info('Backup completed')
+                try:
-
+                    _notify('Backup completed')
-            try:
+                except NameError:
-                _notify('Backup completed')
+                    pass
-            except NameError:
-                pass
 
             return 0
 
 
-def _parse_arguments() -> argparse.Namespace:
+def _parse_arguments():
-    euid = os.geteuid()
-
-    if euid == 0:
-        user = os.getenv('SUDO_USER')
-    else:
-        user = os.getenv('USER')
-
-    homedir = os.path.expanduser(f'~{user}')
-
     parser = argparse.ArgumentParser(prog='simple_backup',
                                      description='Simple backup script written in Python that uses rsync to copy files',
                                      epilog='See simple_backup(1) manpage for full documentation',
                                      formatter_class=MyFormatter)
 
-    parser.add_argument('-v', '--verbose', action='store_true',
-                        help='More verbose output')
     parser.add_argument('-c', '--config', default=f'{homedir}/.config/simple_backup/simple_backup.conf',
                         help='Specify location of configuration file')
-    parser.add_argument('-i', '--inputs', nargs='+',
+    parser.add_argument('-i', '--inputs', nargs='+', help='Paths/files to backup')
-                        help='Paths/files to backup')
+    parser.add_argument('-o', '--output', help='Output directory for the backup')
-    parser.add_argument(
+    parser.add_argument('-e', '--exclude', nargs='+', help='Files/directories/patterns to exclude from the backup')
-        '-o', '--output', help='Output directory for the backup')
+    parser.add_argument('-k', '--keep', type=int, help='Number of old backups to keep')
-    parser.add_argument('-e', '--exclude', nargs='+',
+    parser.add_argument('--ssh-host', help='Server hostname (for remote backup)')
-                        help='Files/directories/patterns to exclude from the backup')
+    parser.add_argument('--ssh-user', help='Username to connect to server (for remote backup)')
-    parser.add_argument('-k', '--keep', type=int,
+    parser.add_argument('--keyfile', help='SSH key location')
-                        help='Number of old backups to keep')
-    parser.add_argument(
-        '-u', '--user', help='Explicitly specify the user running the backup')
     parser.add_argument('-s', '--checksum', action='store_true',
                         help='Use checksum rsync option to compare files')
-    parser.add_argument(
+    parser.add_argument('-z', '--compress', action='store_true', help='Compress data during the transfer')
-        '--ssh-host', help='Server hostname (for remote backup)')
-    parser.add_argument(
-        '--ssh-user', help='Username to connect to server (for remote backup)')
-    parser.add_argument('--keyfile', help='SSH key location')
-    parser.add_argument('-z', '--compress', action='store_true',
-                        help='Compress data during the transfer')
     parser.add_argument('--remove-before-backup', action='store_true',
                         help='Remove old backups before executing the backup, instead of after')
-    parser.add_argument('--no-syslog', action='store_true',
+    parser.add_argument('--no-syslog', action='store_true', help='Disable systemd journal logging')
-                        help='Disable systemd journal logging')
     parser.add_argument('--rsync-options', nargs='+',
-                        choices=['a', 'l', 'p', 't', 'g', 'o',
+                        choices=['a', 'l', 'p', 't', 'g', 'o', 'c', 'h', 's', 'D', 'H', 'X'],
-                                 'c', 'h', 's', 'D', 'H', 'X'],
                         help='Specify options for rsync')
-    parser.add_argument('--remote-sudo', action='store_true',
+    parser.add_argument('--remote-sudo', action='store_true', help='Run rsync on remote server with sudo if allowed')
-                        help='Run rsync on remote server with sudo if allowed')
     parser.add_argument('--numeric-ids', action='store_true',
                         help='Use rsync \'--numeric-ids\' option (don\'t map uid/gid values by name)')
 
@@ -693,31 +588,24 @@ def _parse_arguments() -> argparse.Namespace:
     return args
 
 
-def _expand_inputs(inputs, user: Optional[str] = None):
+def _expand_inputs(inputs):
     expanded_inputs = []
 
     for i in inputs:
         if i == '':
             continue
 
-        if user is not None:
+        i_ex = glob(os.path.expanduser(i.replace('~', f'~{user}')))
-            i_ex = glob(os.path.expanduser(i.replace('~', f'~{user}')))
-        else:
-            i_ex = glob(i)
-
-            if '~' in i:
-                logger.warning('Cannot expand \'~\'. No user specified')
 
         if len(i_ex) == 0:
-            logger.warning(
+            logger.warning('No file or directory matching input %s. Skipping...', i)
-                'No file or directory matching input %s. Skipping...', i)
         else:
             expanded_inputs.extend(i_ex)
 
     return expanded_inputs
 
 
-def _read_config(config_file, user: Optional[str] = None):
+def _read_config(config_file):
     config_args = {'inputs': None,
                    'output': None,
                    'exclude': None,
@@ -729,11 +617,7 @@ def _read_config(config_file, user: Optional[str] = None):
                    'numeric_ids': False}
 
     if not os.path.isfile(config_file):
-        if user is not None:
+        logger.warning('Config file %s does not exist', config_file)
-            logger.warning('Config file %s does not exist', config_file)
-        else:
-            logger.warning(
-                'User not specified. Can\'t read configuration file')
 
         return config_args
 
@@ -750,17 +634,13 @@ def _read_config(config_file, user: Optional[str] = None):
         inputs = config.get(section, 'inputs')
 
     inputs = inputs.split(',')
-    inputs = _expand_inputs(inputs, user)
+    inputs = _expand_inputs(inputs)
     inputs = list(set(inputs))
 
     config_args['inputs'] = inputs
 
     output = config.get(section, 'backup_dir')
-
+    output = os.path.expanduser(output.replace('~', f'~{user}'))
-    if user is not None:
-        output = os.path.expanduser(output.replace('~', f'~{user}'))
-    elif user is None and '~' in output:
-        logger.warning('Cannot expand \'~\', no user specified')
 
     config_args['output'] = output
 
@@ -813,55 +693,29 @@ def _read_config(config_file, user: Optional[str] = None):
     return config_args
 
 
-def _notify(text: str) -> None:
+def _notify(text):
-    euid = os.geteuid()
+    _euid = os.geteuid()
 
-    if euid == 0:
+    if _euid == 0:
         uid = os.getenv('SUDO_UID')
     else:
-        uid = euid
+        uid = os.geteuid()
-
-    if uid is None:
-        return
 
     os.seteuid(int(uid))
     os.environ['DBUS_SESSION_BUS_ADDRESS'] = f'unix:path=/run/user/{uid}/bus'
 
-    obj = dbus.SessionBus().get_object('org.freedesktop.Notifications',
+    obj = dbus.SessionBus().get_object('org.freedesktop.Notifications', '/org/freedesktop/Notifications')
-                                       '/org/freedesktop/Notifications')
     obj = dbus.Interface(obj, 'org.freedesktop.Notifications')
     obj.Notify('', 0, '', 'simple_backup', text, [], {'urgency': 1}, 10000)
 
-    os.seteuid(int(euid))
+    os.seteuid(int(_euid))
 
 
-def simple_backup() -> int:
+def simple_backup():
     """Main"""
 
     args = _parse_arguments()
 
-    if args.user:
-        user = args.user
-        homedir = os.path.expanduser(f'~{user}')
-    else:
-        euid = os.geteuid()
-
-        if euid == 0:
-            user = os.getenv('SUDO_USER')
-
-            if user is not None:
-                homedir = os.path.expanduser(f'~{user}')
-            else:
-                logger.warning(
-                    'Failed to detect user. You can use -u/--user parameter to manually specify it')
-                homedir = None
-        else:
-            user = os.getenv('USER')
-            homedir = os.getenv('HOME')
-
-    if homedir is None:
-        homedir = ''
-
     if args.no_syslog:
         try:
             logger.removeHandler(j_handler)
@@ -869,11 +723,10 @@ def simple_backup() -> int:
             pass
 
     try:
-        config_args = _read_config(args.config, user)
+        config_args = _read_config(args.config)
     except (configparser.NoSectionError, configparser.NoOptionError):
         logger.critical('Bad configuration file')
-
+        sys.exit(6)
-        return 6
 
     inputs = args.inputs if args.inputs is not None else config_args['inputs']
     output = args.output if args.output is not None else config_args['output']
@@ -882,11 +735,10 @@ def simple_backup() -> int:
     ssh_host = args.ssh_host if args.ssh_host is not None else config_args['ssh_host']
     ssh_user = args.ssh_user if args.ssh_user is not None else config_args['ssh_user']
     ssh_keyfile = args.keyfile if args.keyfile is not None else config_args['ssh_keyfile']
-    remote_sudo = args.remote_sudo or config_args['remote_sudo']
+    remote_sudo = args.remote_sudo if args.remote_sudo is not None else config_args['remote_sudo']
 
     if args.rsync_options is None:
-        rsync_options = ['-a', '-r', '-v', '-h', '-H',
+        rsync_options = ['-a', '-r', '-v', '-h', '-H', '-X', '-s', '--ignore-missing-args', '--mkpath']
-                         '-X', '-s', '--ignore-missing-args', '--mkpath']
     else:
         rsync_options = ['-r', '-v']
 
@@ -905,9 +757,9 @@ def simple_backup() -> int:
     rsync_options = ' '.join(rsync_options)
 
     backup = Backup(inputs, output, exclude, keep, rsync_options, ssh_host, ssh_user, ssh_keyfile,
-                    remote_sudo, remove_before=args.remove_before_backup, verbose=args.verbose)
+                    remote_sudo, remove_before=args.remove_before_backup)
 
-    return_code = backup.check_params(homedir)
+    return_code = backup.check_params()
 
     if return_code == 0:
         return backup.run()