Skip to content

Fix ZIP handling for submodules #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix ZIP handling for submodules #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b4a9d5
add .gitattributes to enforce LF end-of-line even on Windows
MaxGaukler Jan 9, 2018
237530e
Fix ZIP for submodules
MaxGaukler Jul 30, 2018
18d629c
Fix regression: Secure temporary directory, fix output file parameter
MaxGaukler Jun 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.sh eol=lf
16 changes: 10 additions & 6 deletions git-archive-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,7 @@ OLD_IFS=$IFS
IFS="$(printf '\n \t')"

function cleanup () {
rm -f $TMPFILE
rm -f $TMPLIST
rm -f $TOARCHIVE
rm -rf $MYTMPDIR
IFS="$OLD_IFS"
}

Expand Down Expand Up @@ -188,8 +186,11 @@ done

OLD_PWD="`pwd`"
TMPDIR=${TMPDIR:-/tmp}
MYTMPDIR=`mktemp -d "$TMPDIR/$PROGRAM.XXXXXX"`
TMPDIR=$MYTMPDIR
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

Expand Down Expand Up @@ -286,11 +287,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 -q "$file" && rm -f "$file"
done
zip --quiet --recurse-paths "$superfile" .
cd "$OLD_PWD"
fi

Expand Down