Merge branch 'maint'

4 files changed, 9 insertions, 4 deletions

diff --git a/configure.ac b/configure.ac
index 4faf20d9..7d4e60f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -210,6 +210,7 @@ esac
 
 AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes")
 AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes")
+AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] )
 AC_SUBST(SIZECMD)
 AC_SUBST(SEDINPLACE)
 AC_SUBST(STRIP_BINARIES)
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 330acb98..0fde3345 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -42,6 +42,7 @@ edit = sed \
 	-e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \
 	-e 's|@SIZECMD[@]|$(SIZECMD)|g' \
 	-e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \
+	-e 's|@DUPATH[@]|$(DUPATH)|g' \
 	-e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g'
 
 ## All the scripts depend on Makefile so that they are rebuilt when the
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index fdedc89b..e16b54e5 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -906,7 +906,7 @@ write_pkginfo() {
 	else
 		local packager="Unknown Packager"
 	fi
-	local size="$(du -sk)"
+	local size="$(@DUPATH@ -sk)"
 	size="$(( ${size%%[^0-9]*} * 1024 ))"
 
 	msg2 "$(gettext "Generating .PKGINFO file...")"
@@ -968,7 +968,7 @@ check_package() {
 	done
 
 	# check for references to the build directory
-	if grep -R "${srcdir}" "${pkgdir}" &>/dev/null; then
+	if find "${pkgdir}" -type f -exec grep -q "${srcdir}" {} +; then
 		warning "$(gettext "Package contains reference to %s")" "\$srcdir"
 	fi
 }
@@ -1243,7 +1243,7 @@ check_sanity() {
 			# evaluate any bash variables used
 			eval file=${file}
 			if [[ ! -f $file ]]; then
-				error "$(gettext "%s file (%s) does not exist.")" "${i^}" "$file"
+				error "$(gettext "%s file (%s) does not exist.")" "$i" "$file"
 				return 1
 			fi
 		done
diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
index 7bde6007..2838f817 100644
--- a/scripts/repo-add.sh.in
+++ b/scripts/repo-add.sh.in
@@ -487,7 +487,10 @@ if (( success )); then
 
 	[[ -f $REPO_DB_FILE ]] && mv -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old"
 	[[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE"
-	ln -sf "$REPO_DB_FILE" "${REPO_DB_FILE%.tar.*}"
+	dblink="${REPO_DB_FILE%.tar.*}"
+	ln -sf "$REPO_DB_FILE" "$dblink" 2>/dev/null || \
+		ln -f "$REPO_DB_FILE" "$dblink" 2>/dev/null || \
+		cp "$REPO_DB_FILE" "$dblink"
 else
 	msg "$(gettext "No packages modified, nothing to do.")"
 	exit 1