Use :..: instead of _..._ for include protection

CodingMarkus · CodingMarkus · commit b99789bdf286 · 2022-02-03T13:04:33.000+01:00
diff --git a/lib/psst/basic.inc.sh b/lib/psst/basic.inc.sh
@@ -2,9 +2,9 @@
 
 # Double include protection
 case "${INCLUDE_SEEN_PSST-}" in
-	*_basic_*) return
+	*:basic:*) return
 esac
-INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}_basic_"
+INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}:basic:"
 
 # Ensure INCLUDE_PSST is set
 [ -n "${INCLUDE_PSST-}" ] || { echo "INCLUDE_PSST not set!" >&2 ; exit 1 ; }
diff --git a/lib/psst/basic/assert.inc.sh b/lib/psst/basic/assert.inc.sh
@@ -2,9 +2,9 @@
 
 # Double include protection
 case "${INCLUDE_SEEN_PSST-}" in
-	*_assert_*) return
+	*:assert:*) return
 esac
-INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}_assert_"
+INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}:assert:"
 
 
 ##
diff --git a/lib/psst/basic/chkcmd.inc.sh b/lib/psst/basic/chkcmd.inc.sh
@@ -2,9 +2,9 @@
 
 # Double include protection
 case "${INCLUDE_SEEN_PSST-}" in
-	*_chkcmd_*) return
+	*:chkcmd:*) return
 esac
-INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}_chkcmd_"
+INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}:chkcmd:"
 
 # Ensure INCLUDE_PSST is set
 [ -n "${INCLUDE_PSST-}" ] || { echo "INCLUDE_PSST not set!" >&2 ; exit 1 ; }
diff --git a/lib/psst/basic/const.inc.sh b/lib/psst/basic/const.inc.sh
@@ -2,9 +2,9 @@
 
 # Double include protection
 case "${INCLUDE_SEEN_PSST-}" in
-	*_const_*) return
+	*:const:*) return
 esac
-INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}_const_"
+INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}:const:"
 
 
 ##
diff --git a/lib/psst/basic/conv.inc.sh b/lib/psst/basic/conv.inc.sh
@@ -2,9 +2,9 @@
 
 # Double include protection
 case "${INCLUDE_SEEN_PSST-}" in
-	*_conv_*) return
+	*:conv:*) return
 esac
-INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}_conv_"
+INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}:conv:"
 
 # Ensure INCLUDE_PSST is set
 [ -n "${INCLUDE_PSST-}" ] || { echo "INCLUDE_PSST not set!" >&2 ; exit 1 ; }
diff --git a/lib/psst/basic/esc.inc.sh b/lib/psst/basic/esc.inc.sh
@@ -2,9 +2,9 @@
 
 # Double include protection
 case "${INCLUDE_SEEN_PSST-}" in
-	*_esc_*) return
+	*:esc:*) return
 esac
-INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}_esc_"
+INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}:esc:"
 
 # Ensure INCLUDE_PSST is set
 [ -n "${INCLUDE_PSST-}" ] || { echo "INCLUDE_PSST not set!" >&2 ; exit 1 ; }
diff --git a/lib/psst/basic/global.inc.sh b/lib/psst/basic/global.inc.sh
@@ -2,9 +2,9 @@
 
 # Double include protection
 case "${INCLUDE_SEEN_PSST-}" in
-	*_global_*) return
+	*:global:*) return
 esac
-INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}_global_"
+INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}:global:"
 
 
 ##
diff --git a/lib/psst/basic/ifs.inc.sh b/lib/psst/basic/ifs.inc.sh
@@ -2,9 +2,9 @@
 
 # Double include protection
 case "${INCLUDE_SEEN_PSST-}" in
-	*_ifs_*) return
+	*:ifs:*) return
 esac
-INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}_ifs_"
+INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}:ifs:"
 
 # Ensure INCLUDE_PSST is set
 [ -n "${INCLUDE_PSST-}" ] || { echo "INCLUDE_PSST not set!" >&2 ; exit 1 ; }
diff --git a/lib/psst/basic/onexit.inc.sh b/lib/psst/basic/onexit.inc.sh
@@ -4,7 +4,7 @@
 case "${INCLUDE_SEEN_PSST-}" in
     *_onexit_*) return
 esac
-INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}_onexit_"
+INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}:onexit:"
 
 # Ensure INCLUDE_PSST is set
 [ -n "${INCLUDE_PSST-}" ] || { echo "INCLUDE_PSST not set!" >&2 ; exit 1 ; }
diff --git a/lib/psst/basic/perror.inc.sh b/lib/psst/basic/perror.inc.sh
@@ -2,9 +2,9 @@
 
 # Double include protection
 case "${INCLUDE_SEEN_PSST-}" in
-	*_perror_*) return
+	*:perror:*) return
 esac
-INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}_perror_"
+INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}:perror:"
 
 # Ensure INCLUDE_PSST is set
 [ -n "${INCLUDE_PSST-}" ] || { echo "INCLUDE_PSST not set!" >&2 ; exit 1 ; }
diff --git a/lib/psst/basic/print.inc.sh b/lib/psst/basic/print.inc.sh
@@ -2,9 +2,9 @@
 
 # Double include protection
 case "${INCLUDE_SEEN_PSST-}" in
-	*_print_*) return
+	*:print:*) return
 esac
-INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}_print_"
+INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}:print:"
 
 # Ensure INCLUDE_PSST is set
 [ -n "${INCLUDE_PSST-}" ] || { echo "INCLUDE_PSST not set!" >&2 ; exit 1 ; }
diff --git a/lib/psst/basic/stack.inc.sh b/lib/psst/basic/stack.inc.sh
@@ -2,9 +2,9 @@
 
 # Double include protection
 case "${INCLUDE_SEEN_PSST-}" in
-	*_stack_*) return
+	*:stack:*) return
 esac
-INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}_stack_"
+INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}:stack:"
 
 # Ensure INCLUDE_PSST is set
 [ -n "${INCLUDE_PSST-}" ] || { echo "INCLUDE_PSST not set!" >&2 ; exit 1 ; }
diff --git a/lib/psst/basic/test.inc.sh b/lib/psst/basic/test.inc.sh
@@ -2,9 +2,9 @@
 
 # Double include protection
 case "${INCLUDE_SEEN_PSST-}" in
-	*_test_*) return
+	*:test:*) return
 esac
-INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}_test_"
+INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}:test:"
 
 
 # shellcheck source=assert.inc.sh
diff --git a/lib/psst/basic/tmpdir.inc.sh b/lib/psst/basic/tmpdir.inc.sh
@@ -2,9 +2,9 @@
 
 # Double include protection
 case "${INCLUDE_SEEN_PSST-}" in
-	*_tempdir_*) return
+	*:tempdir:*) return
 esac
-INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}_tempdir_"
+INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}:tempdir:"
 
 # Ensure INCLUDE_PSST is set
 [ -n "${INCLUDE_PSST-}" ] || { echo "INCLUDE_PSST not set!" >&2 ; exit 1 ; }
diff --git a/lib/psst/file.inc.sh b/lib/psst/file.inc.sh
@@ -2,9 +2,9 @@
 
 # Double include protection
 case "${INCLUDE_SEEN_PSST-}" in
-	*_file_*) return
+	*:file:*) return
 esac
-INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}_file_"
+INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}:file:"
 
 # Ensure INCLUDE_PSST is set
 [ -n "${INCLUDE_PSST-}" ] || { echo "INCLUDE_PSST not set!" >&2 ; exit 1 ; }
diff --git a/lib/psst/file/abspath.inc.sh b/lib/psst/file/abspath.inc.sh
@@ -2,9 +2,9 @@
 
 # Double include protection
 case "${INCLUDE_SEEN_PSST-}" in
-	*_abspath_*) return
+	*:abspath:*) return
 esac
-INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}_abspath_"
+INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}:abspath:"
 
 # Ensure INCLUDE_PSST is set
 [ -n "${INCLUDE_PSST-}" ] || { echo "INCLUDE_PSST not set!" >&2 ; exit 1 ; }
diff --git a/lib/psst/file/glob.inc.sh b/lib/psst/file/glob.inc.sh
@@ -2,9 +2,9 @@
 
 # Double include protection
 case "${INCLUDE_SEEN_PSST-}" in
-	*_glob_*) return
+	*:glob:*) return
 esac
-INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}_glob_"
+INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-}:glob:"
 
 # Ensure INCLUDE_PSST is set
 [ -n "${INCLUDE_PSST-}" ] || { echo "INCLUDE_PSST not set!" >&2 ; exit 1 ; }
