more flexible path construction

1 files changed, 3 insertions, 1 deletions

diff --git a/backomp b/backomp
index e45eff8..69ac1ca 100755
--- a/backomp
+++ b/backomp
@@ -379,7 +379,9 @@ while IFS= read -r line; do
 	fi
 
 	src="${f2}"
-	dest="${base_path}${base_path:+/}$(expand_opts "${f1}")"
+	dest="${base_path}"
+	[[ -n "${dest}" && "${dest}" != *[/:] ]] && dest="${dest}/"
+	dest="${dest}$(expand_opts "${f1#./}")"
 	tainted_dest="$?"
 	printf '[%d] [%s] %s => %s\n' "${bcount}" "${opts['retain']}" \
 		"${src}" "${dest}"