Miscellany

Index: fwmod
===================================================================
--- fwmod       (Revision 1548)
+++ fwmod       (Arbeitskopie)
@@ -689,18 +689,11 @@
                do
                        bn="$(basename "$i")"
                        lib="${bn%\.so*}"
-                       lib="$(echo "$lib" | sed 's/^libglib-2/libglib2-2/')"
-                       lib="$(echo "$lib" | sed 's/^libgobject-2/libgobject2-2/')"
-                       lib="$(echo "$lib" | sed 's/^libgmodule-2/libgmodule2-2/')"
-                       lib="$(echo "$lib" | sed 's/^libgthread-2/libgthread2-2/')"
-                       lib="$(echo "$lib" | sed 's/-[0-9][\.0-9a-z]*$//')"
+                       lib="$(echo "$lib" | sed -r 's/^libg(lib|object|module|thread)-2/libg\12-2/;s/-[0-9][\.0-9a-z]*$//')"
                        if [ "$(eval "echo \"\$DS_LIB_$(echo "$lib" | tr '\-+' '_x')\"")" == "y" ]; then
                                echo2 "${bn}"
                                dn="$(dirname "$i")"
-                               lib="$(echo "$lib" | sed 's/^libglib2/libglib-2/')"
-                               lib="$(echo "$lib" | sed 's/^libgobject2/libgobject-2/')"
-                               lib="$(echo "$lib" | sed 's/^libgmodule2/libgmodule-2/')"
-                               lib="$(echo "$lib" | sed 's/^libgthread2/libgthread-2/')"
+                               lib="$(echo "$lib" | sed -r 's/^libg(lib|object|module|thread)2/libg\1-2/')"
                                [ -d "${FILESYSTEM_MOD_DIR}/${dn}" ] || mkdir -p "${FILESYSTEM_MOD_DIR}/${dn}"
                                cp -a "${ROOT_DIR}/${dn}/${lib}"[-\|\.]*so* "${FILESYSTEM_MOD_DIR}/${dn}/"
                                chmod +x "${FILESYSTEM_MOD_DIR}/${i}"