summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Willard <travis@archlinux.org>2008-01-05 09:54:58 -0500
committerAaron Griffin <aaronmgriffin@gmail.com>2008-01-23 16:11:37 -0600
commitd853dee3ed47c30497e0c97d0c7962c4d196dde9 (patch)
tree3ecd695e8cf3c611d334f7756db78a5c736c5296
parent9e627e219e7c0e3fb3aa21fe24e056d5233f6841 (diff)
Fix getopts bug and be more specific when moving package file.
My recent commit adding the -c option and renaming the old -c to -r accidentally left out the new '-r' option from the getopts call. Additionally, add ${pkgrel} to the mv line after building to be more specific about that file to move. Signed-off-by: Travis Willard <travis@archlinux.org> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-rwxr-xr-xmakechrootpkg4
1 files changed, 2 insertions, 2 deletions
diff --git a/makechrootpkg b/makechrootpkg
index c7ce273..1e26042 100755
--- a/makechrootpkg
+++ b/makechrootpkg
@@ -44,7 +44,7 @@ usage ()
exit 1
}
-while getopts ':c:h' arg; do
+while getopts ':r:h:c' arg; do
case "${arg}" in
r) chrootdir="$OPTARG" ;;
c) clean_first=1 ;;
@@ -172,7 +172,7 @@ else
source ${WORKDIR}/PKGBUILD
if [ -z "$(mount | grep ${chrootdir}/union/pkgdest)" ]; then
echo "Moving completed package file to ${WORKDIR}"
- mv ${chrootdir}/union/pkgdest/${pkgname}-${pkgver}-*.pkg.tar.gz ${WORKDIR}
+ mv ${chrootdir}/union/pkgdest/${pkgname}-${pkgver}-${pkgrel}-*.pkg.tar.gz ${WORKDIR}
fi
if [ -z "$(mount | grep ${chrootdir}/union/srcdest)" ]; then
echo "Moving downloaded source files to ${WORKDIR}"