* fixed filepath_contains_filepath for the '.' directory where foo.sh now matches

Author: mulle-nat

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.13)
 
-project( mulle-bashfunctions VERSION 6.6.0 LANGUAGES NONE)
+project( mulle-bashfunctions VERSION 6.6.1 LANGUAGES NONE)
 
 
 #

mulle-bash

@@ -151,7 +151,7 @@ fi
 # this is "our" version
 # the actual loaded version may differ (and will change this variable)
 #
-MULLE_BASHFUNCTIONS_VERSION="6.6.0"
+MULLE_BASHFUNCTIONS_VERSION="6.6.1"
 MULLE_BASHFUNCTIONS_LIBEXEC_DIRNAME="libexec"
 MULLE_EXECUTABLE="$1"
 

src/mulle-bashfunctions-all-embed.sh

@@ -3458,19 +3458,35 @@ function r_assert_sane_path()
 
 filepath_contains_filepath()
 {
-    local string1="${1%/}"  # Path to check, remove trailing slash
-    local string2="${2%/}"  # Directory path, remove trailing slash
+    local filepath="${1%/}"  # Path to check, remove trailing slash
+    local other="${2%/}"  # Directory path, remove trailing slash
 
-    case "${string2}" in
-        ${string1})
-            return 0
-            ;;
-        ${string1}/*)
-            return 0
-            ;;
-        *)
+    r_simplified_path "${filepath}"
+    filepath="${RVAL}"
+
+    r_simplified_path "${other}"
+    RVAL=${RVAL}
+
+    case "${filepath}" in 
+      .)
+         if is_absolutepath "${other}"
+         then 
             return 1
-            ;;
+         fi
+         return 0
+      ;;
+    esac
+
+    case "${other}" in
+         ${filepath})
+             return 0
+         ;;
+         ${filepath}/*)
+             return 0
+         ;;
+         *)
+             return 1
+         ;;
     esac
 }
 

src/mulle-bashfunctions-all.sh

@@ -3641,19 +3641,35 @@ function r_assert_sane_path()
 
 filepath_contains_filepath()
 {
-    local string1="${1%/}"  # Path to check, remove trailing slash
-    local string2="${2%/}"  # Directory path, remove trailing slash
+    local filepath="${1%/}"  # Path to check, remove trailing slash
+    local other="${2%/}"  # Directory path, remove trailing slash
 
-    case "${string2}" in
-        ${string1})
-            return 0
-            ;;
-        ${string1}/*)
-            return 0
-            ;;
-        *)
+    r_simplified_path "${filepath}"
+    filepath="${RVAL}"
+
+    r_simplified_path "${other}"
+    RVAL=${RVAL}
+
+    case "${filepath}" in 
+      .)
+         if is_absolutepath "${other}"
+         then 
             return 1
-            ;;
+         fi
+         return 0
+      ;;
+    esac
+
+    case "${other}" in
+         ${filepath})
+             return 0
+         ;;
+         ${filepath}/*)
+             return 0
+         ;;
+         *)
+             return 1
+         ;;
     esac
 }
 

src/mulle-bashfunctions-embed.sh

@@ -3458,19 +3458,35 @@ function r_assert_sane_path()
 
 filepath_contains_filepath()
 {
-    local string1="${1%/}"  # Path to check, remove trailing slash
-    local string2="${2%/}"  # Directory path, remove trailing slash
+    local filepath="${1%/}"  # Path to check, remove trailing slash
+    local other="${2%/}"  # Directory path, remove trailing slash
 
-    case "${string2}" in
-        ${string1})
-            return 0
-            ;;
-        ${string1}/*)
-            return 0
-            ;;
-        *)
+    r_simplified_path "${filepath}"
+    filepath="${RVAL}"
+
+    r_simplified_path "${other}"
+    RVAL=${RVAL}
+
+    case "${filepath}" in 
+      .)
+         if is_absolutepath "${other}"
+         then 
             return 1
-            ;;
+         fi
+         return 0
+      ;;
+    esac
+
+    case "${other}" in
+         ${filepath})
+             return 0
+         ;;
+         ${filepath}/*)
+             return 0
+         ;;
+         *)
+             return 1
+         ;;
     esac
 }
 

src/mulle-bashfunctions.sh

@@ -3641,19 +3641,35 @@ function r_assert_sane_path()
 
 filepath_contains_filepath()
 {
-    local string1="${1%/}"  # Path to check, remove trailing slash
-    local string2="${2%/}"  # Directory path, remove trailing slash
+    local filepath="${1%/}"  # Path to check, remove trailing slash
+    local other="${2%/}"  # Directory path, remove trailing slash
 
-    case "${string2}" in
-        ${string1})
-            return 0
-            ;;
-        ${string1}/*)
-            return 0
-            ;;
-        *)
+    r_simplified_path "${filepath}"
+    filepath="${RVAL}"
+
+    r_simplified_path "${other}"
+    RVAL=${RVAL}
+
+    case "${filepath}" in 
+      .)
+         if is_absolutepath "${other}"
+         then 
             return 1
-            ;;
+         fi
+         return 0
+      ;;
+    esac
+
+    case "${other}" in
+         ${filepath})
+             return 0
+         ;;
+         ${filepath}/*)
+             return 0
+         ;;
+         *)
+             return 1
+         ;;
     esac
 }
 

src/mulle-path.sh

@@ -827,26 +827,42 @@ function r_assert_sane_path()
 # filepath_contains_filepath <filepath> <other>
 #
 #    Check if <other> is identical to <filepath> or a plausible file or 
-#    subdirectoy. This is just string matching!
+#    subdirectory. This is just string matching! No filesystem checks
 #
 filepath_contains_filepath()
 {
-    local string1="${1%/}"  # Path to check, remove trailing slash
-    local string2="${2%/}"  # Directory path, remove trailing slash
+    local filepath="${1%/}"  # Path to check, remove trailing slash
+    local other="${2%/}"  # Directory path, remove trailing slash
 
-    case "${string2}" in
-        # Case 1: Strings are identical
-        ${string1})
-            return 0
-            ;;
-        # Case 2: string1 is a subdirectory or file inside string2
-        ${string1}/*)
-            return 0
-            ;;
-        # Not a match
-        *)
+    r_simplified_path "${filepath}"
+    filepath="${RVAL}"
+
+    r_simplified_path "${other}"
+    RVAL=${RVAL}
+
+    case "${filepath}" in 
+      .)
+         if is_absolutepath "${other}"
+         then 
             return 1
-            ;;
+         fi
+         return 0
+      ;;
+    esac
+
+    case "${other}" in
+         # Case 1: Strings are identical
+         ${filepath})
+             return 0
+         ;;
+         # Case 2: string1 is a subdirectory or file inside other
+         ${filepath}/*)
+             return 0
+         ;;
+         # Not a match
+         *)
+             return 1
+         ;;
     esac
 }