Simplify code

Re-do and fix commit 2a1f08b

Author: Olf0

src/tools/pm_apply

@@ -125,13 +125,10 @@ mangle_libpath() {
         if [ $found -eq $cand_lines ]; then  # first run in loop
           mkdir -p "$PM_PATCH_BACKUP_DIR"
           patch_edited_path="$PM_PATCH_BACKUP_DIR"/"$PATCH_EDITED_NAME"
-          printf '#\n# Patch converted to %sbit library paths from its original by Patchmanager > 3.1\n# Date: %s\n#\n' $SYS_BITNESS $(date -Iseconds) > "$patch_edited_path"
-          cat "$PATCH_PATH" >> "$patch_edited_path"
-        fi
-        sed -i "s@^+++ $p@+++ $pr@;s@^--- $p@--- $pr@" "$patch_edited_path"  # patch the Patch
-        if [ $? -ne 0 ]; then
-          failure
+          printf '#\n# Patch converted to %sbit library paths from its original by Patchmanager > 3.1\n# Date: %s\n#\n' $SYS_BITNESS $(date -Iseconds) \
+          | cat - "$PATCH_PATH" > "$patch_edited_path"
         fi
+        sed -i "s@^+++ $p@+++ $pr@;s@^--- $p@--- $pr@" "$patch_edited_path" || failure || true  # patch the Patch
       done
       if [ $found -eq 0 ]; then
         log