do not set +x on exe files

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 71e997153f17d3a2532edbcee96c20dbd7a6eaab..322764b8c9df4d2dd2021364042309866e610c43 100755 (executable)
--- a/all
+++ b/all
@@ -277,9 +277,10 @@ mkzip()
        archive=$1
        shift
        ziplist=`mktemp`
-       find "$@" -xtype f         \( -type f -not -executable \)    -print > "$ziplist"; 7za a -tzip -mx=9 -i@"$ziplist" "$archive" || true
+       find "$@" -xtype f \( -executable -or -type l \) -print > "$ziplist"
+       7za a -tzip -mx=9 -x@"$ziplist" "$archive" "$@" || true
+       zip         -9y   -@<"$ziplist" "$archive"      || true
        rm -f "$ziplist"
-       find "$@" -xtype f \( -not \( -type f -not -executable \) \) -print             | zip         -9y   -@            "$archive" || true
 }
 
 mkzip0()
@@ -1268,6 +1269,8 @@ case "$cmd" in
                ;;
        release-zip)
                stamp=`cat Xonotic/stamp.txt`
+               # exe and dll files do not need +x, so this makes them eligible for 7zip compression too
+               chmod a-x *.exe *.dll
                # need to use infozip for these (+x bits)
                verbose mkzip Xonotic-$stamp-engine.zip \
                        Xonotic/*.dll \