Add PKGBUILD

If allowed by the remote server, try using sudo to remove
old backups (rm needs to be allowed in sudoers to run
without password)

PKGBUILD

@@ -0,0 +1,40 @@
+# 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.5
+pkgrel=1
+url="https://github.com/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=('4da838282fff813f82ee0408996c989078a206eabce07112b4e3ee8b057e34cf')
+
+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

@@ -2,12 +2,12 @@
 .SH NAME
 simple_backup \- Backup files and folders using rsync
 .SH SYNOPSIS
-.BR simple_backup
+.B simple_backup
 \-h, \-\-help
 .PD 0
 .P
 .PD
-.BR simple_backup
+.B simple_backup
 [\-c, \-\-config FILE]
 [\-i, \-\-input INPUT [INPUT...]]
 [\-o, \-\-output DIR]
@@ -16,8 +16,8 @@ simple_backup \- Backup files and folders using rsync
 .PD
 .RS 14 [\-e, \-\-exclude FILE|DIR|PATTERN [FILE|...]]
 [\-k, \-\-keep N]
-[\-\-host HOSTNAME]
-[\-u, \-\-username USERNAME]
+[\-\-ssh\-host HOSTNAME]
+[\-\-ssh\-user USERNAME]
 [\-\-keyfile FILE]
 .PD 0
 .P
@@ -27,7 +27,7 @@ simple_backup \- Backup files and folders using rsync
 [\-\-remove\-before\-backup]
 .RE
 .SH DESCRIPTION
-.BR simple_backup
+.B simple_backup
 is a python script for performing backup of files and folders.
 .P
 It uses rsync to copy the files to the specified location. Parameters for the backup such as
@@ -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,21 +52,24 @@ 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 \-\-host HOSTNAME
-Hostname of the server where to copy the files in case of remote backup through SSH
+.B \-u, \-\-user USERNAME
+Explicitly specify the user running the backup (in case it is needed for home directory expansion).
 .TP
-.B \-u, \-\-username USERNAME
-Username for connecting to the server in case of remote backup
+.B \-\-ssh\-host HOSTNAME
+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.
 .TP
 .B \-\-keyfile FILE
 Location of the SSH key for server authentication. 
@@ -85,45 +88,49 @@ 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
-.PP
+.P
     \-a \-r \-v \-h \-s \-H \-X
-.PP
+.P
 Using \-\-rsync\-options it is possible to manually select which options to use. Supported values are the following:
-.PP
+.P
     \-a, \-l, \-p, \-t, \-g, \-o, \-c, \-h, \-D, \-H, \-X, \-s
-.PP
+.P
 Options \-r and \-v are used in any case. Not that options must be specified without dash (\-), for example:
-.PP
+.P
 .EX
     simple_backup \-\-rsync\-options a l p
 .EE
-.TP
+.P
 Check
-.B rsync (1)
+.BR rsync (1)
 for details about the options.
 .RE
 .TP
 .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
-.PP
+.P
     <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.
 .SH REMOTE BACKUP
 It is possible to choose a directory on a remote server as destination for the backup. The files
 are copied by rsync through SSH. Server hostname and username must be specified, either in the
-configuration file, or on the command line (\(aq\-\-host\(aq and \(aq\-\-username\(aq options).
+configuration file, or on the command line (\(aq\-\-ssh\-host\(aq and \(aq\-\-ssh\-user\(aq options).
 .SS AUTHENTICATION
 For authentication, it is possible to use SSH key or password.
 .P
@@ -136,7 +143,7 @@ When running
 .B simple_backup
 with
 .B sudo,
-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:
+in order to connect to the user\(aqs SSH agent it is necessary to preserve the \(aqSSH_AUTH_SOCK\(aq environment variable, for example:
 .P
 .EX
     sudo --preserve-env=SSH_AUTH_SOCK -s simple_backup [options]
@@ -145,8 +152,7 @@ in order to connect to the user\(aq s SSH agent it is necessary to preserve the
 It is also possible to make this permanent by editing the
 .B sudoers
 file (see
-.B sudoers (5)
-)
+.BR sudoers (5))
 .P
 If SSH key authentication is not available, password authentication will be used instead.
 Note that in this case
@@ -154,30 +160,30 @@ Note that in this case
 (if available) will be used to send the password to rsync, to avoid prompting the user for
 the password multiple
 times. This can pose some security risks, see
-.B sshpass (1)
+.BR sshpass (1)
 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

setup.cfg

@@ -13,16 +13,14 @@ classifiers =
    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
    Topic :: System :: Archiving :: Backup
 
 [options]
 packages = simple_backup
-python_requires = >=3.7
+python_requires = >=3.10
 install_requires =
    python-dotenv
 

simple_backup/__init__.py

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

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/my_home,/etc
+inputs=/home/user
 
 # Output directory.
 backup_dir=/media/Backup
@@ -15,8 +15,8 @@ keep=-1
 
 # Uncomment the following section to enable backup to remote server through ssh
 # [server]
-# host=
-# username=
+# ssh_host=
+# ssh_user=
 # ssh_keyfile=
 # remote_sudo=
 # numeric_ids=

simple_backup/simple_backup.py

@@ -10,9 +10,11 @@ Classes:
     MyFormatter
     Backup
 """
+
 # 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
@@ -25,7 +27,7 @@ from timeit import default_timer
 from subprocess import Popen, PIPE, STDOUT
 from datetime import datetime
 from tempfile import mkstemp
-from getpass import getpass
+from getpass import GetPassWarning, getpass
 from glob import glob
 
 from dotenv import load_dotenv
@@ -33,7 +35,6 @@ from dotenv import load_dotenv
 warnings.filterwarnings('error')
 
 try:
-    raise ImportError
     import paramiko
     from paramiko import RSAKey, Ed25519Key, ECDSAKey, DSSKey
 except ImportError:
@@ -51,15 +52,6 @@ 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()
@@ -76,29 +68,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:
-            _logger: Logger object
+            func: Function to decorate
     """
-    def decorator_timing(func):
-        @wraps(func)
-        def wrapper_timing(*args, **kwargs):
-            start = default_timer()
+    @wraps(func)
+    def wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
+        start = default_timer()
 
-            value = func(*args, **kwargs)
+        value = func(*args, **kwargs)
 
-            end = default_timer()
+        end = default_timer()
 
-            _logger.info(f'Elapsed time: {end - start:.3f} seconds')
+        logger.info('Elapsed time: %.3f seconds', end - start)
 
-            return value
+        return value
 
-        return wrapper_timing
-
-    return decorator_timing
+    return wrapper
 
 
 class MyFormatter(argparse.RawTextHelpFormatter, argparse.ArgumentDefaultsHelpFormatter):
@@ -119,9 +111,9 @@ class Backup:
             String representing main backup options for rsync
         keep: int
             Number of old backup to preserve
-        host: str
+        ssh_host: str
             Hostname of server (for remote backup)
-        username: str
+        ssh_user: str
             Username for server login (for remote backup)
         ssh_keyfile: str
             Location of ssh key
@@ -143,30 +135,31 @@ class Backup:
             Perform the backup
     """
 
-    def __init__(self, inputs, output, exclude, keep, options, host=None, username=None,
-                 ssh_keyfile=None, remote_sudo=False, remove_before=False):
+    def __init__(self, inputs: List[str], output: str, exclude: List[str], keep: int, options: str,
+                 ssh_host: Optional[str] = None, ssh_user: Optional[str] = None, ssh_keyfile: Optional[str] = None,
+                 remote_sudo: bool = False, remove_before: bool = False, verbose: bool = False) -> None:
         self.inputs = inputs
         self.output = output
         self.exclude = exclude
         self.options = options
         self.keep = keep
-        self.host = host
-        self.username = username
+        self.ssh_host = ssh_host
+        self.ssh_user = ssh_user
         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 = None
-        self._err_flag = False
+        self._remote = False
         self._ssh = None
         self._password_auth = False
         self._password = None
 
-    def check_params(self):
+    def check_params(self, homedir: str = '') -> int:
         """Check if parameters for the backup are valid"""
 
         if self.inputs is None or len(self.inputs) == 0:
@@ -179,14 +172,14 @@ class Backup:
 
             return 2
 
-        if self.host is not None and self.username is not None:
+        if self.ssh_host is not None and self.ssh_user is not None:
             self._remote = True
 
         if self._remote:
-            self._ssh = self._ssh_connect()
+            self._ssh = self._ssh_connect(homedir)
 
             if self._ssh is None:
-                sys.exit(5)
+                return 5
 
             _, stdout, _ = self._ssh.exec_command(f'if [ -d "{self.output}" ]; then echo "ok"; fi')
 
@@ -210,18 +203,20 @@ class Backup:
         return 0
 
     # Function to create the actual backup directory
-    def define_backup_dir(self):
+    def define_backup_dir(self) -> None:
         """Define the actual backup dir"""
         now = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
         self._output_dir = f'{self.output}/simple_backup/{now}'
 
         if self._remote:
-            self._server = f'{self.username}@{self.host}:'
+            self._server = f'{self.ssh_user}@{self.ssh_host}:'
 
-    def remove_old_backups(self):
+    def remove_old_backups(self) -> None:
         """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')
 
             dirs = stdout.read().decode('utf-8').strip().split('\n')
@@ -238,7 +233,10 @@ class Backup:
                 dirs.sort()
 
                 for i in range(n_backup - self.keep):
-                    _, _, stderr = self._ssh.exec_command(f'rm -r "{self.output}/simple_backup/{dirs[i]}"')
+                    if self.remote_sudo:
+                        _, _, 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]
 
@@ -278,7 +276,7 @@ class Backup:
         elif count > 1:
             logger.info('Removed %d backups', count)
 
-    def find_last_backup(self):
+    def find_last_backup(self) -> None:
         """Get path of last backup (from last_backup symlink) for rsync --link-dest"""
 
         if self._remote:
@@ -304,7 +302,7 @@ class Backup:
                 logger.critical('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
 
@@ -315,26 +313,27 @@ class Backup:
             except IndexError:
                 logger.info('No previous backups available')
 
-    def _ssh_connect(self):
+    def _ssh_connect(self, homedir: str = '') -> paramiko.client.SSHClient:
         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(f'Cannot find file {homedir}/.ssh/known_hosts')
+            logger.warning('Cannot find file %s/.ssh/known_hosts', homedir)
 
         ssh.set_missing_host_key_policy(paramiko.WarningPolicy())
 
         try:
-            ssh.connect(self.host, username=self.username)
+            ssh.connect(self.ssh_host, username=self.ssh_user)
 
             return ssh
         except UserWarning:
-            k = input(f'Unknown key for host {self.host}. Continue anyway? (Y/N) ')
+            k = input(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())
@@ -349,7 +348,7 @@ class Backup:
             pass
 
         try:
-            ssh.connect(self.host, username=self.username)
+            ssh.connect(self.ssh_host, username=self.ssh_user)
 
             return ssh
         except paramiko.SSHException:
@@ -357,13 +356,18 @@ class Backup:
 
         if self.ssh_keyfile is None:
             try:
-                password = getpass(f'{self.username}@{self.host}\'s password: ')
-                ssh.connect(self.host, username=self.username, password=password)
+                password = getpass(f'{self.ssh_user}@{self.ssh_host}\'s 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)
@@ -410,7 +414,7 @@ class Backup:
                     pass
 
         try:
-            ssh.connect(self.host, username=self.username, pkey=pkey)
+            ssh.connect(self.ssh_host, username=self.ssh_user, pkey=pkey)
         except paramiko.SSHException:
             logger.critical('SSH connection to server failed')
 
@@ -418,9 +422,38 @@ 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(logger)
-    def run(self):
+    @timing
+    def run(self) -> int:
         """Perform the backup"""
 
         logger.info('Starting backup...')
@@ -449,7 +482,7 @@ class Backup:
             logger.info('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
 
@@ -475,10 +508,12 @@ class Backup:
             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}"'
 
+        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\''
         elif self._password_auth and which('sshpass'):
-            rsync = f'{rsync} -e \'sshpass -e ssh -l {self.username} -o StrictHostKeyChecking=no\''
+            rsync = f'{rsync} -e \'sshpass -e ssh -l {self.ssh_user} -o StrictHostKeyChecking=no\''
         else:
             rsync = f'{rsync} -e \'ssh -o StrictHostKeyChecking=no\''
 
@@ -488,6 +523,7 @@ 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:
@@ -495,16 +531,24 @@ class Backup:
             except KeyError:
                 pass
 
-            if p.returncode != 0:
-                self._err_flag = True
+            returncode = p.returncode
 
         output = output.decode("utf-8").split('\n')
 
-        if self._err_flag:
-            logger.error('rsync: %s', output)
+        if returncode == 0:
+            if self._verbose:
+                logger.info('rsync: %s', output)
+            else:
+                logger.info('rsync: %s', output[-3])
+                logger.info('rsync: %s', output[-2])
         else:
-            logger.info('rsync: %s', output[-3])
-            logger.info('rsync: %s', output[-2])
+            self._returncode_log(returncode)
+
+            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()
@@ -513,6 +557,8 @@ 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')
 
             output = stdout.read().decode('utf-8').strip()
@@ -535,7 +581,7 @@ class Backup:
             if self._ssh:
                 self._ssh.close()
         else:
-            if self._err_flag:
+            if returncode != 0:
                 logger.error('Some errors occurred while performing the backup')
 
                 try:
@@ -544,34 +590,44 @@ class Backup:
                     pass
 
                 return 4
-            else:
-                logger.info('Backup completed')
 
-                try:
-                    _notify('Backup completed')
-                except NameError:
-                    pass
+            logger.info('Backup completed')
+
+            try:
+                _notify('Backup completed')
+            except NameError:
+                pass
 
             return 0
 
 
 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='+', help='Paths/files to backup')
     parser.add_argument('-o', '--output', help='Output directory for the backup')
     parser.add_argument('-e', '--exclude', nargs='+', help='Files/directories/patterns to exclude from the backup')
     parser.add_argument('-k', '--keep', type=int, help='Number of old backups to keep')
-    parser.add_argument('--host', help='Server hostname (for remote backup)')
-    parser.add_argument('-u', '--username', help='Username to connect to server (for remote backup)')
+    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('--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('-s', '--checksum', action='store_true',
-                        help='Use checksum rsync option to compare files')
     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')
@@ -581,21 +637,27 @@ def _parse_arguments():
                         help='Specify options for rsync')
     parser.add_argument('--remote-sudo', action='store_true', 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')
+                        help='Use rsync \'--numeric-ids\' option (don\'t map uid/gid values by name)')
 
     args = parser.parse_args()
 
     return args
 
 
-def _expand_inputs(inputs):
+def _expand_inputs(inputs, user=None):
     expanded_inputs = []
 
     for i in inputs:
         if i == '':
             continue
 
-        i_ex = glob(os.path.expanduser(i.replace('~', f'~{user}')))
+        if user is not None:
+            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('No file or directory matching input %s. Skipping...', i)
@@ -605,13 +667,13 @@ def _expand_inputs(inputs):
     return expanded_inputs
 
 
-def _read_config(config_file):
+def _read_config(config_file, user=None):
     config_args = {'inputs': None,
                    'output': None,
                    'exclude': None,
                    'keep': -1,
-                   'host': None,
-                   'username': None,
+                   'ssh_host': None,
+                   'ssh_user': None,
                    'ssh_keyfile': None,
                    'remote_sudo': False,
                    'numeric_ids': False}
@@ -634,13 +696,17 @@ def _read_config(config_file):
         inputs = config.get(section, 'inputs')
 
     inputs = inputs.split(',')
-    inputs = _expand_inputs(inputs)
+    inputs = _expand_inputs(inputs, user)
     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
 
@@ -660,14 +726,14 @@ def _read_config(config_file):
     config_args['keep'] = keep
 
     try:
-        host = config.get('server', 'host')
-        username = config.get('server', 'username')
+        ssh_host = config.get('server', 'ssh_host')
+        ssh_user = config.get('server', 'ssh_user')
     except (configparser.NoSectionError, configparser.NoOptionError):
-        host = None
-        username = None
+        ssh_host = None
+        ssh_user = None
 
-    config_args['host'] = host
-    config_args['username'] = username
+    config_args['ssh_host'] = ssh_host
+    config_args['ssh_user'] = ssh_user
 
     try:
         ssh_keyfile = config.get('server', 'ssh_keyfile')
@@ -694,12 +760,15 @@ def _read_config(config_file):
 
 
 def _notify(text):
-    _euid = os.geteuid()
+    euid = os.geteuid()
 
-    if _euid == 0:
+    if euid == 0:
         uid = os.getenv('SUDO_UID')
     else:
-        uid = os.geteuid()
+        uid = euid
+
+    if uid is None:
+        return
 
     os.seteuid(int(uid))
     os.environ['DBUS_SESSION_BUS_ADDRESS'] = f'unix:path=/run/user/{uid}/bus'
@@ -708,7 +777,7 @@ def _notify(text):
     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():
@@ -716,6 +785,22 @@ def simple_backup():
 
     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')
+            homedir = os.path.expanduser(f'~{user}')
+        else:
+            user = os.getenv('USER')
+            homedir = os.getenv('HOME')
+
+    if homedir is None:
+        homedir = ''
+
     if args.no_syslog:
         try:
             logger.removeHandler(j_handler)
@@ -723,19 +808,20 @@ def simple_backup():
             pass
 
     try:
-        config_args = _read_config(args.config)
+        config_args = _read_config(args.config, user)
     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']
     exclude = args.exclude if args.exclude is not None else config_args['exclude']
     keep = args.keep if args.keep is not None else config_args['keep']
-    host = args.host if args.host is not None else config_args['host']
-    username = args.username if args.username is not None else config_args['username']
+    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 if args.remote_sudo is not None else config_args['remote_sudo']
+    remote_sudo = args.remote_sudo or config_args['remote_sudo']
 
     if args.rsync_options is None:
         rsync_options = ['-a', '-r', '-v', '-h', '-H', '-X', '-s', '--ignore-missing-args', '--mkpath']
@@ -756,10 +842,10 @@ def simple_backup():
 
     rsync_options = ' '.join(rsync_options)
 
-    backup = Backup(inputs, output, exclude, keep, rsync_options, host, username, ssh_keyfile,
-                    remote_sudo, remove_before=args.remove_before_backup)
+    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)
 
-    return_code = backup.check_params()
+    return_code = backup.check_params(homedir)
 
     if return_code == 0:
         return backup.run()