fix: 🐛 get_target_file to accept 'common' or current hostname in file…

… path

Signed-off-by: Eric Villard <[email protected]>

install.sh

@@ -10,6 +10,11 @@ main_dir()
     dirname "$(readlink -f "${BASH_SOURCE}")"
 }
 
+config_dir()
+{
+    echo "$(main_dir)/config"
+}
+
 config_copy_dir()
 {
     echo "$(main_dir)/config/copy"
@@ -64,12 +69,9 @@ find_files()
 get_target_file()
 {
     local sourcefile="$1"
-
-    if [[ "${sourcefile}" =~ \/common ]]; then
-        echo "${sourcefile/*\/common/}"
-    else
-        echo "${sourcefile/*\/${HOSTNAME}/}"
-    fi    
+    local configdir="$(config_dir)"
+
+    echo "${sourcefile}" | sed -r "s/${configdir//\//\\\/}\/[^\/]+\/(common|${HOSTNAME})//"
 }
 
 ensure_parent_dir()

tests/fix-get_target_file-test.sh

@@ -0,0 +1,14 @@
+. "$(main_dir)"/install.sh
+
+##
+path="$(main_dir)/config/copy/common/some/path/with/common/inside/file.config"
+expected="/some/path/with/common/inside/file.config"
+
+assert_equals "${expected}" "$(get_target_file "${path}")"
+
+##
+export HOSTNAME="hostname1"
+path="$(main_dir)/config/copy/${HOSTNAME}/some/path/with/${HOSTNAME}/inside/file.config"
+expected="/some/path/with/${HOSTNAME}/inside/file.config"
+
+assert_equals "${expected}" "$(get_target_file "${path}")"