ob-installplatconf, ob-installdocs: Replace "${dest%/*}" checks with dirname

1 files changed, 6 insertions, 7 deletions

diff --git a/src/ob-installplatconf.sh b/src/ob-installplatconf.sh
index c4a4765..d980ff8 100644
--- a/src/ob-installplatconf.sh
+++ b/src/ob-installplatconf.sh
@@ -28,6 +28,7 @@ copy_config()
 {
 	list="${1}"
 	dest_base="${2}"
+	dir=
 
 	while read -r src dest; do
 		if [ -z "${src}" ] || [ -z "${dest}" ]; then
@@ -36,13 +37,11 @@ copy_config()
 		fi
 
 		# Make sure the destination directory exists.
-		if [ "x${dest%/*}" != "x${dest}" ]; then
-			if ! mkdir -p "${dest_base}/${dest%/*}"; then
-				ob_error "$(ob_get_msg \
-					'cant_make_config_dest_dir')" \
-					"${dest%/*}"
-				return 1
-			fi
+		dir="(dirname "${dest_base}/${dest}")"
+		if ! mkdir -p "${dir}"; then
+			ob_error "$(ob_get_msg 'cant_make_config_dest_dir')" \
+				"${dir}"
+			return 1
 		fi
 
 		# Find the config package files.