Use install to create directories for modules

modules/05-install-remap-keys.sh

@@ -96,10 +96,7 @@ function configure_system() {
   local xpcConsumerPath="${dstDir}/astzweig-xpc-consumer"
   local remapKeysPath="${dstDir}/remap-keys"
   local launchDaemonPath="/Library/LaunchDaemons/${serviceName}.plist"
-  [[ -d ${dstDir} ]] || {
+  ensurePathOrLogError ${dstDir} 'Could not install remap-keys.' || return 10
-    lop -- -e "Could not install remap-keys. Directory ${dstDir} does not exist."
-    return 10
-  }
   [[ -x ${remapKeysPath} ]] || indicateActivity createRemapKeysBinary 'Create remap-keys executable'
   [[ -x ${xpcConsumerPath} ]] || createXPCConsumer 'Create XPC event consuer'
   [[ -f ${launchDaemonPath} ]] || createLaunchDaemon 'Create Launch Daemon'

modules/07-install-binaries.sh

@@ -9,10 +9,7 @@ function ensureRightAccess() {
 
 function configure_system() {
   local dstDir='/usr/local/bin'
-  [[ -d ${dstDir} ]] || {
+  ensurePathOrLogError ${dstDir} 'Could not install binaries.' || return 10
-    lop -- -e "Could not install binaries. Directory ${dstDir} does not exist."
-    return 10
-  }
   pushd -q ${_DIR}/../bin
   for file in *; do
     indicateActivity cp,${file},${dstDir} "Copying ${file}"
@@ -24,6 +21,7 @@ function configure_system() {
 function getExecPrerequisites() {
   cmds=(
     [cp]=''
+    [install]=''
   )
 }
 

modules/lib.sh

@@ -27,6 +27,14 @@ function getModuleAnswerByKeyRegEx() {
   return 1
 }
 
+function ensurePathOrLogError() {
+  local dir=$1 msg=$2
+  [[ -d ${dir} ]] || install -m $(umask -S) -d $(getMissingPaths ${dir}) || {
+    lop -- -e "$msg" -e "Directory ${dir} does not exist and could not be created."
+    return 10
+  }
+}
+
 function checkCommands() {
   local cmd
   for cmd in ${(k)cmds}; do