From ffbf79cc5e5dd705121679153d4665d507060f1a Mon Sep 17 00:00:00 2001
From: buhtz <c.buhtz@posteo.jp>
Date: Fri, 2 Feb 2024 11:37:32 +0100
Subject: [PATCH] fix: Add --diagnostics to bash-completion and fix symlink
 error while installation

Fix symlink error while make install.

Add --diagnostics option to the completion script.

Fix #1615
---
 CHANGES                           |  2 +-
 common/bash-completion/backintime | 10 ++++++----
 common/configure                  |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index a3b7bb6fa..cb9d6852d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
 Back In Time
 
 Version 1.4.4-dev (development of upcoming release)
-* TODO
+* Fix bug: Bash-completion symlink creation while installing & adding --diagnostics (#1615)
 
 Version 1.4.3 (2024-01-30)
 * Feature: Exclude 'SingletonLock' and 'SingletonCookie' (Discord) and 'lock' (Mozilla Firefox) files by default (part of #1555)
diff --git a/common/bash-completion/backintime b/common/bash-completion/backintime
index 775a82aa3..7d977b6a8 100644
--- a/common/bash-completion/backintime
+++ b/common/bash-completion/backintime
@@ -1,4 +1,4 @@
-#extract profile and config arguments
+# extract profile and config arguments
 _bit_extr_opts()
 {
     local c=0 last="" opts=""
@@ -15,7 +15,7 @@ _bit_extr_opts()
     echo "${opts}"
 }
 
-#return a list of all snapshots
+# return a list of all snapshots
 _bit_snapshots_list()
 {
     backintime$(_bit_extr_opts) --quiet snapshots-list | awk '{print $2}'
@@ -30,14 +30,15 @@ _backintime()
     prev="${COMP_WORDS[COMP_CWORD-1]}"
     opts="--profile --profile-id --quiet --config --version --license       \
           --help --debug --checksum --no-crontab --keep-mount --delete      \
-          --local-backup --no-local-backup --only-new --share-path"
+          --local-backup --no-local-backup --only-new --share-path          \
+	  --diagnostics"
     actions="backup backup-job snapshots-path snapshots-list                \
              snapshots-list-path last-snapshot last-snapshot-path unmount   \
              benchmark-cipher pw-cache decode remove restore check-config   \
              smart-remove shutdown"
     pw_cache_commands="start stop restart reload status"
 
-    #extract the current action
+    # extract the current action
     while [[ $c -le $[${COMP_CWORD} - 1] ]]; do
         case ${actions} in
             *"${COMP_WORDS[$c]}"*)
@@ -103,3 +104,4 @@ _backintime()
 }
 complete -F _backintime backintime
 complete -F _backintime backintime-qt
+
diff --git a/common/configure b/common/configure
index 6615d491f..41aa1a370 100755
--- a/common/configure
+++ b/common/configure
@@ -53,7 +53,7 @@ addInstallFile () {
 addSymlink () {
     dst=$1
     src=$2
-    printf "\tln -s $dst \$(DEST)$src\n" >> ${MAKEFILE}
+    printf "\tln --symbolic --force $dst \$(DEST)$src\n" >> ${MAKEFILE}
     addUninstallFile "$src"
 }