[devscripts] 01/01: debrepro: set indentation to 4 spaces, no tabs
Antonio Terceiro
terceiro at moszumanska.debian.org
Sun Dec 4 20:23:48 UTC 2016
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository devscripts.
commit 6c7a06a363b9d945ae9090798ff636b2a18eb113
Author: Antonio Terceiro <terceiro at debian.org>
Date: Sun Dec 4 18:23:06 2016 -0200
debrepro: set indentation to 4 spaces, no tabs
---
scripts/debrepro.sh | 223 +++++++++++++++++++++++++++-------------------------
1 file changed, 114 insertions(+), 109 deletions(-)
diff --git a/scripts/debrepro.sh b/scripts/debrepro.sh
index d49943f..5451c9e 100755
--- a/scripts/debrepro.sh
+++ b/scripts/debrepro.sh
@@ -20,168 +20,171 @@
set -eu
usage() {
- echo "usage: $0 [OPTIONS] [SOURCEDIR]"
+ echo "usage: $0 [OPTIONS] [SOURCEDIR]"
+ echo ""
+ echo "Options:"
+ echo ""
}
first_banner=y
banner() {
- if [ "$first_banner" = n ]; then
+ if [ "$first_banner" = n ]; then
+ echo
+ fi
+ echo "$@" | sed -e 's/./=/g'
+ echo "$@"
+ echo "$@" | sed -e 's/./=/g'
echo
- fi
- echo "$@" | sed -e 's/./=/g'
- echo "$@"
- echo "$@" | sed -e 's/./=/g'
- echo
- first_banner=n
+ first_banner=n
}
variation() {
- echo
- echo "# Variation:" "$@"
+ echo
+ echo "# Variation:" "$@"
}
vary() {
- local var="$1"
-
- for skipped in $skip_variations; do
- if [ "$skipped" = "$var" ]; then
- return
- fi
- done
-
- variation "$var"
- local first="$2"
- local second="$3"
- if [ "$which_build" = 'first' ]; then
- if [ -n "$first" ]; then
- echo "$first"
+ local var="$1"
+
+ for skipped in $skip_variations; do
+ if [ "$skipped" = "$var" ]; then
+ return
+ fi
+ done
+
+ variation "$var"
+ local first="$2"
+ local second="$3"
+ if [ "$which_build" = 'first' ]; then
+ if [ -n "$first" ]; then
+ echo "$first"
+ fi
+ else
+ echo "$second"
fi
- else
- echo "$second"
- fi
}
create_build_script() {
- echo 'set -eu'
+ echo 'set -eu'
- echo
- echo "# this script must be run from inside an unpacked Debian source"
- echo "# package"
- echo
+ echo
+ echo "# this script must be run from inside an unpacked Debian source"
+ echo "# package"
+ echo
- vary path \
- '' \
- 'export PATH="$PATH":/i/capture/the/path'
+ vary path \
+ '' \
+ 'export PATH="$PATH":/i/capture/the/path'
- vary user \
- 'export USER=user1' \
- 'export USER=user2'
+ vary user \
+ 'export USER=user1' \
+ 'export USER=user2'
- vary umask \
- 'umask 0022' \
- 'umask 0002'
+ vary umask \
+ 'umask 0022' \
+ 'umask 0002'
- vary locale \
- 'export LC_ALL=C.UTF-8 LANG=C.UTF-8' \
- 'export LC_ALL=pt_BR.UTF-8 LANG=pt_BR.UTF-8'
+ vary locale \
+ 'export LC_ALL=C.UTF-8 LANG=C.UTF-8' \
+ 'export LC_ALL=pt_BR.UTF-8 LANG=pt_BR.UTF-8'
- vary timezone \
- 'export TZ=UTC' \
- 'export TZ=Asia/Tokyo'
+ vary timezone \
+ 'export TZ=UTC' \
+ 'export TZ=Asia/Tokyo'
- if which disorderfs >/dev/null; then
- disorderfs_commands='mkdir ../disorderfs &&
+ if which disorderfs >/dev/null; then
+ disorderfs_commands='mkdir ../disorderfs &&
disorderfs --shuffle-dirents=yes $(pwd) ../disorderfs &&
trap "cd .. && fusermount -u disorderfs && rmdir disorderfs" INT TERM EXIT &&
cd ../disorderfs'
- vary filesystem-ordering \
- '' \
- "$disorderfs_commands"
- fi
+ vary filesystem-ordering \
+ '' \
+ "$disorderfs_commands"
+ fi
- vary time \
- 'build_prefix=""' \
- 'build_prefix="faketime +213days+7hours+13minutes"'
+ vary time \
+ 'build_prefix=""' \
+ 'build_prefix="faketime +213days+7hours+13minutes"'
- echo '$build_prefix dpkg-buildpackage -b -us -uc'
+ echo '$build_prefix dpkg-buildpackage -b -us -uc'
}
build() {
- export which_build="$1"
- mkdir "$tmpdir/build"
- cp -r "$SOURCE" "$tmpdir/build/source"
+ export which_build="$1"
+ mkdir "$tmpdir/build"
+ cp -r "$SOURCE" "$tmpdir/build/source"
- cd "$tmpdir/build/source"
- create_build_script > ../build.sh
- sh ../build.sh
- cd -
+ cd "$tmpdir/build/source"
+ create_build_script > ../build.sh
+ sh ../build.sh
+ cd -
- mv "$tmpdir/build" "$tmpdir/$which_build"
+ mv "$tmpdir/build" "$tmpdir/$which_build"
}
binmatch() {
- cmp --silent "$1" "$2"
+ cmp --silent "$1" "$2"
}
compare() {
- rc=0
- for first_deb in "$tmpdir"/first/*.deb; do
- deb="$(basename "$first_deb")"
- second_deb="$tmpdir"/second/"$deb"
- if binmatch "$first_deb" "$second_deb"; then
- echo "✓ $deb: binaries match"
- else
- echo "✗ $deb: binaries don't match"
- rc=1
+ rc=0
+ for first_deb in "$tmpdir"/first/*.deb; do
+ deb="$(basename "$first_deb")"
+ second_deb="$tmpdir"/second/"$deb"
+ if binmatch "$first_deb" "$second_deb"; then
+ echo "✓ $deb: binaries match"
+ else
+ echo "✗ $deb: binaries don't match"
+ rc=1
+ fi
+ done
+ if [ "$rc" -ne 0 ]; then
+ if which diffoscope >/dev/null; then
+ diffoscope "$tmpdir"/first/*.changes "$tmpdir"/second/*.changes || true
+ else
+ echo "I: install diffoscope for a deep comparison between artifacts"
+ fi
+ echo "E: package is not reproducible."
fi
- done
- if [ "$rc" -ne 0 ]; then
- if which diffoscope >/dev/null; then
- diffoscope "$tmpdir"/first/*.changes "$tmpdir"/second/*.changes || true
- else
- echo "I: install diffoscope for a deep comparison between artifacts"
- fi
- echo "E: package is not reproducible."
- fi
- return "$rc"
+ return "$rc"
}
TEMP=$(getopt -n "debrepro" -o 's:' \
- -l 'skip:' \
- -- "$@") || (rc=$?; usage >&2; exit $rc)
+ -l 'skip:' \
+ -- "$@") || (rc=$?; usage >&2; exit $rc)
eval set -- "$TEMP"
skip_variations=""
while true; do
- case "$1" in
- -s|--skip)
- case "$2" in
- user|path|umask|locale|timezone|filesystem-ordering)
- skip_variations="$skip_variations $2"
- ;;
- *)
- echo "E: invalid variation name $2"
- exit 1
- ;;
- esac
- shift
- ;;
- --)
- shift
- break
- ;;
- esac
- shift
+ case "$1" in
+ -s|--skip)
+ case "$2" in
+ user|path|umask|locale|timezone|filesystem-ordering)
+ skip_variations="$skip_variations $2"
+ ;;
+ *)
+ echo "E: invalid variation name $2"
+ exit 1
+ ;;
+ esac
+ shift
+ ;;
+ --)
+ shift
+ break
+ ;;
+ esac
+ shift
done
SOURCE="${1:-}"
if [ -z "$SOURCE" ]; then
- SOURCE="$(pwd)"
+ SOURCE="$(pwd)"
fi
if [ ! -f "$SOURCE/debian/changelog" ]; then
- echo "E: $SOURCE does not look like a Debian source package"
- exit 2
+ echo "E: $SOURCE does not look like a Debian source package"
+ exit 2
fi
tmpdir=$(mktemp --directory --tmpdir debrepro.XXXXXXXXXX)
@@ -195,3 +198,5 @@ build second
banner "Comparing binaries"
compare first second
+
+# vim:ts=4 sw=4 et
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git
More information about the devscripts-devel
mailing list