Merge branch 'master' into staging-next

2019-09-15 13:18:54 +02:00
parent 9f8a7d2679 c860babfe6
commit b6c6e1f9e8
192 changed files with 4150 additions and 2678 deletions
@@ -80,9 +80,9 @@ wrapQtAppsHook() {
    do
        [ -d "$targetDir" ] || continue

-        find "$targetDir" -executable -print0 | while IFS= read -r -d '' file
+        find "$targetDir" -type f -executable -print0 | while IFS= read -r -d '' file
        do
-            isELFExec "$file" || continue
+            patchelf --print-interpreter "$file" >/dev/null 2>&1 || continue

            if [ -f "$file" ]
            then