mkinitcpio: bashification, part 1/2

Always use bash's [[ ]], and apply (( )) where arithmetic calculations
are made. We also take a few other bash shortcuts to simplify code where
possible.

We also touch the Makefile here to adjust the sed'ing for directory
names.

Signed-off-by: Dave Reisner <d@falconindy.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/functions b/functions
index bd80eb2..a4f6c0c 100644
--- a/functions
+++ b/functions
@@ -188,8 +188,8 @@ add_module() {
     local module path fw dep deps
     module=${1%.ko*}
 
-    #skip expensive stuff if this module has already been added
-    in_array $module ${ADDED_MODULES[@]} && return
+    # skip expensive stuff if this module has already been added
+    in_array "${module//-/_}" "${ADDED_MODULES[@]}" && return
 
     path=$(kmodinfo -0F filename "$module")
     if [[ $path ]]; then
@@ -206,7 +206,7 @@ add_module() {
             add_module "$dep"
         done
 
-        ADDED_MODULES+=("$module")
+        ADDED_MODULES+=("${module//-/_}")
         add_file "$path" || return
     else
         error "module '$module' not found"