reproducible Debian: refactoring

Signed-off-by: Holger Levsen <holger@layer-acht.org>

bin/reproducible_debstrap.sh

@@ -30,10 +30,11 @@ cleanup() {
 cleanup_unreproducible_file(){
 	local TYPE=$1
 	local FILE=$2
-	if [ -f $FILE ] ; then
-		output_echo "Warning: modifying $TOOL result, deleting $TYPE $FILE"
+	if sudo file -E $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}/$FILE >/dev/null 2>&1 ; then
+		output_echo "Warning: modifying $TOOL result, deleting unreproducible $TYPE $FILE"
 		sudo rm -rf --one-file-system $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}/$FILE
 	else
+		sudo file $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}/$FILE
 		output_echo "Warning: shall remove $FILE but it does not exist. Maybe $TOOL was improved."
 	fi
 }
@@ -77,19 +78,18 @@ for LOOP in "first" "second" ; do
 		debootstrap|cdebootstrap)
 				sudo $REALTOOL $SUITE $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}
 				# work around unreproducible artifacts
-				case ${TOOL} in
-					debootstrap)	BAD_LOGFILES="/var/log/bootstrap.log /var/log/dpkg.log /var/log/alternatives.log"
 				BAD_FILES="/etc/machine-id /var/cache/ldconfig/aux-cache"
+				case ${TOOL} in
+					debootstrap)	BAD_LOGFILES="/var/log/dpkg.log /var/log/alternatives.log /var/log/bootstrap.log"
 							;;
-					cdebootstrap)	BAD_LOGFILES="/var/log/bootstrap.log /var/log/dpkg.log /var/log/alternatives.log /var/log/apt/history.log /var/log/apt/term.log"
-							BAD_FILES="/etc/machine-id"
+					cdebootstrap)	BAD_LOGFILES="/var/log/dpkg.log /var/log/alternatives.log /var/log/bootstrap.log /var/log/apt/history.log /var/log/apt/term.log"
 							;;
 				esac
-				for FILE in $BAD_LOGFILES ; do
-					cleanup_unreproducible_file "unreproducible logfile" $FILE
+				for i in $BAD_LOGFILES ; do
+					cleanup_unreproducible_file logfile "$i"
 				done
-				for FILE in $BAD_FILES ; do
-					cleanup_unreproducible_file "unreproducible file" $FILE
+				for i in $BAD_FILES ; do
+					cleanup_unreproducible_file file "$i"
 				done
 				sudo tar --mtime="@$SOURCE_DATE_EPOCH" --clamp-mtime -C $BUILDDIR/$SUBDIR/${TOOL}/ -cf $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}.tar ${SUITE}
 				sudo rm -rf --one-file-system $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}