fix 7z/zip decision again :(

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 71e997153f17d3a2532edbcee96c20dbd7a6eaab..41040a1290bb0e4105a164454fca0d755818123d 100755 (executable)
--- a/all
+++ b/all
@@ -277,9 +277,10 @@ mkzip()
        archive=$1
        shift
        ziplist=`mktemp`
        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"
        rm -f "$ziplist"

-       find "$@" -xtype f \( -not \( -type f -not -executable \) \) -print             | zip         -9y   -@            "$archive" || true

 }
 
 mkzip0()
 }
 
 mkzip0()