Revert "Bug 20147: (re-)dzip.sh: various improvements"

#!/bin/sh -e

#!/bin/sh

# Crappy deterministic zip wrapper

export LC_ALL=C

ZIPFILE=${1:?}

ZIPFILE=$1

shift

if [ -n "$REFERENCE_DATETIME" ]; then

	find "$@" -exec touch --date="$REFERENCE_DATETIME" -- {} +

fi

find "$@"   -executable -exec chmod 700 {} +

find "$@" ! -executable -exec chmod 600 {} +

find "$@" | sort | zip $ZIPOPTS -X -@ "$ZIPFILE"

[ -n "$REFERENCE_DATETIME" ] && \

	find $@ -exec touch --date="$REFERENCE_DATETIME" {} \;

find $@ -executable -exec chmod 700 {} \;

find $@ ! -executable -exec chmod 600 {} \;

find $@ | sort | zip $ZIPOPTS -X -@ "$ZIPFILE"

#!/bin/sh -e

#!/bin/sh

# Crappy deterministic zip repackager

export LC_ALL=C

ZIPFILE_BASENAME=$(basename -- "${1:?}")

TEMPDIR=tmp-re-dzip-$$

RE_DZIP=$(readlink -f -- "$(which -- "$0")")

PATH=$PATH:$(dirname "$RE_DZIP")

ZIPFILE=`basename $1`

mkdir "$TEMPDIR"

unzip $UNZIPOPTS -d "$TEMPDIR" -- "$1" || [ $? -lt 3 ]

(cd "$TEMPDIR"; dzip.sh ./"$ZIPFILE_BASENAME" .)

mv -- "$TEMPDIR"/"$ZIPFILE_BASENAME" "$1"

rm -rf "$TEMPDIR"

mkdir tmp_dzip

cd tmp_dzip

unzip ../$1

[ -n "$REFERENCE_DATETIME" ] && \

	find . -exec touch --date="$REFERENCE_DATETIME" {} \;

find . -executable -exec chmod 700 {} \;

find . ! -executable -exec chmod 600 {} \;

find . | sort | zip $ZIPOPTS -X -@ $ZIPFILE

mv $ZIPFILE ../$1

cd ..

rm -rf tmp_dzip