moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 00:08:50 -05:00
Code Issues Releases Wiki Activity

Merge branch 'maint'

Browse Source
This commit is contained in:
Dan McGee 2010-06-30 08:41:43 -05:00
commit 96a1255ead
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -210,6 +210,7 @@ esac
AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes") AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes")
AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "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(SIZECMD)
AC_SUBST(SEDINPLACE) AC_SUBST(SEDINPLACE)
AC_SUBST(STRIP_BINARIES) AC_SUBST(STRIP_BINARIES)

1
scripts/Makefile.am
View File

@ -42,6 +42,7 @@ edit = sed \
-e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \ -e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \
-e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \
-e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \ -e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \
-e 's|@DUPATH[@]|$(DUPATH)|g' \
-e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|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 ## All the scripts depend on Makefile so that they are rebuilt when the

6
scripts/makepkg.sh.in
View File

@ -906,7 +906,7 @@ write_pkginfo() {
else else
local packager="Unknown Packager" local packager="Unknown Packager"
fi fi
local size="$(du -sk)" local size="$(@DUPATH@ -sk)"
size="$(( ${size%%[^0-9]*} * 1024 ))" size="$(( ${size%%[^0-9]*} * 1024 ))"
msg2 "$(gettext "Generating .PKGINFO file...")" msg2 "$(gettext "Generating .PKGINFO file...")"
@ -968,7 +968,7 @@ check_package() {
done done
# check for references to the build directory # 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" warning "$(gettext "Package contains reference to %s")" "\$srcdir"
fi fi
} }
@ -1243,7 +1243,7 @@ check_sanity() {
# evaluate any bash variables used # evaluate any bash variables used
eval file=${file} eval file=${file}
if [[ ! -f $file ]]; then 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 return 1
fi fi
done done

5
scripts/repo-add.sh.in
View File

@ -487,7 +487,10 @@ if (( success )); then
[[ -f $REPO_DB_FILE ]] && mv -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old" [[ -f $REPO_DB_FILE ]] && mv -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old"
[[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE" [[ -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 else
msg "$(gettext "No packages modified, nothing to do.")" msg "$(gettext "No packages modified, nothing to do.")"
exit 1 exit 1