diff options
| author | Allan McRae <mcrae_allan@hotmail.com> | 2008-06-22 12:11:54 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-06-23 04:12:39 +0200 |
| commit | 74eb2f5c6132b0529dd22b33a14232e7059551c1 (patch) | |
| tree | 45626bdca6f6b0267261a0135ea5a82bc795e77a | |
| parent | 7edb2e5b0d55505b49d682f6f4c5b4b1e49c3b72 (diff) | |
| download | pacman-74eb2f5c6132b0529dd22b33a14232e7059551c1.tar.gz pacman-74eb2f5c6132b0529dd22b33a14232e7059551c1.tar.xz | |
Additional path quoting and srcdir/pkgdir usage
Removes the remaining $startdir/{src,pkg} usage and adds quoting
around (hopefully) all remaining path variables
Signed-off-by: Allan McRae <mcrae_allan@hotmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bce2e6cd..4fa69455 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -148,8 +148,7 @@ clean_up() { if [ $EXIT_CODE -eq 0 -a "$CLEANUP" = "1" ]; then # If it's a clean exit and -c/--clean has been passed... msg "$(gettext "Cleaning up...")" - cd "$startdir" - rm -rf pkg src + rm -rf "$pkgdir" "$srcdir" if [ "$pkgname" != "" ]; then # Can't do this unless the BUILDSCRIPT has been sourced. rm -f "${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log*" @@ -510,7 +509,7 @@ generate_checksums() { plain "$(gettext "Aborting...")" exit 1 else - file=$SRCDEST/$file + file="$SRCDEST/$file" fi fi @@ -557,7 +556,7 @@ check_checksums() { errors=1 continue else - file=$SRCDEST/$file + file="$SRCDEST/$file" fi fi @@ -598,7 +597,7 @@ extract_sources() { plain "$(gettext "Aborting...")" exit 1 else - file=$SRCDEST/$file + file="$SRCDEST/$file" fi fi @@ -960,7 +959,7 @@ create_srcpackage() { local file=$(strip_url "$netfile") if [ -f "$netfile" ]; then msg2 "$(gettext "Adding %s...")" "$netfile" - ln -s $netfile ${srclinks}/${pkgname} + ln -s $netfile "${srclinks}/${pkgname}" elif [ "$SOURCEONLY" = "2" -a -f "$SRCDEST/$file" ]; then msg2 "$(gettext "Adding %s...")" "$file" ln -s "$SRCDEST/$file" "${srclinks}/${pkgname}/" @@ -971,13 +970,13 @@ create_srcpackage() { # tar it up msg2 "$(gettext "Compressing source package...")" - cd ${srclinks} + cd "${srclinks}" if ! bsdtar -czLf "$pkg_file" ${pkgname}; then error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi - cd ${startdir} - rm -rf ${srclinks} + cd "${startdir}" + rm -rf "${srclinks}" } install_package() { |