Fix ZIP for submodules

Author: MaxGaukler

git-archive-all.sh

@@ -49,6 +49,7 @@ IFS="$(printf '\n \t')"
 function cleanup () {
     rm -f $TMPFILE
     rm -f $TMPLIST
+    rm -rf $TMP_UNPACK_FOLDER
     rm -f $TOARCHIVE
     IFS="$OLD_IFS"
 }
@@ -190,6 +191,7 @@ OLD_PWD="`pwd`"
 TMPDIR=${TMPDIR:-/tmp}
 TMPFILE=`mktemp "$TMPDIR/$PROGRAM.XXXXXX"` # Create a place to store our work's progress
 TMPLIST=`mktemp "$TMPDIR/$PROGRAM.submodules.XXXXXX"`
+TMP_UNPACK_FOLDER=`mktemp -d "$TMPDIR/$PROGRAM.tmp_unpack_folder.XXXXXX"`
 TOARCHIVE=`mktemp "$TMPDIR/$PROGRAM.toarchive.XXXXXX"`
 OUT_FILE=$OLD_PWD # assume "this directory" without a name change by default
 
@@ -286,12 +288,14 @@ if [ $SEPARATE -eq 0 -o "-" == "$OUT_FILE" ]; then
             $TARCMD --concatenate -f "$superfile" "$file" && rm -f "$file"
         done
     elif [ $FORMAT == 'zip' ]; then
+        # unpack all zip files, then re-pack
+        # unfortunately, more intelligent options don't work:
+        # zipmerge is broken (kills the x bit of directories), and zip --grow does not unpack input zipfiles.
+        cd $TMP_UNPACK_FOLDER
         sed -e '1d' $TMPFILE | while read file; do
-            # zip incorrectly stores the full path, so cd and then grow
-            cd `dirname "$file"`
-            zip -g "$superfile" `basename "$file"` && rm -f "$file"
+            unzip "$file" && rm -f "$file"
         done
-        cd "$OLD_PWD"
+        zip --quiet --recurse-paths "$superfile" .
     fi
 
     echo "$superfile" >| $TMPFILE # clobber on purpose