summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-05-31 06:02:32 +0200
committerDan McGee <dan@archlinux.org>2007-05-31 06:02:32 +0200
commit90a307bfa3bc93be5a24e192deedc761b76cdb8d (patch)
tree609ed06e9f4fa236195f2fd4776f37a0ca227138
parent92a14eab591f9aaface4104c40eef3850181a316 (diff)
downloadpacman-90a307bfa3bc93be5a24e192deedc761b76cdb8d.tar.gz
pacman-90a307bfa3bc93be5a24e192deedc761b76cdb8d.tar.xz
makepkg: switch applicable $startdir/dir refs to new variable names
After introducing $pkgdir and $srcdir, we can switch some lookups to these new variables. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--scripts/makepkg.in16
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/makepkg.in b/scripts/makepkg.in
index badceac5..65edb422 100644
--- a/scripts/makepkg.in
+++ b/scripts/makepkg.in
@@ -399,7 +399,7 @@ run_build() {
fi
msg "$(gettext "Starting build()...")"
- cd "$startdir"/src
+ cd "$srcdir"
# ensure we have a sane umask set
umask 0022
@@ -444,7 +444,7 @@ run_build() {
}
tidy_install() {
- cd "$startdir"/pkg
+ cd "$pkgdir"
msg "$(gettext "Tidying install...")"
if [ "$(check_option docs)" = "n" ]; then
@@ -507,7 +507,7 @@ create_package() {
exit 1 # $E_MISSING_PKGDIR # TODO: error code
fi
- cd "$startdir"/pkg
+ cd "$pkgdir"
msg "$(gettext "Creating package...")"
local builddate=$(LC_ALL= LANG= date -u "+%a %b %e %H:%M:%S %Y")
@@ -995,7 +995,7 @@ fi
cd "$startdir"
mkdir -p src
-cd "$startdir/src"
+cd "$srcdir"
msg "$(gettext "Retrieving Sources...")"
for netfile in ${source[@]}; do
@@ -1166,7 +1166,7 @@ else
if [ "$EUID" = "0" ]; then
# chown all source files to root.root
- chown -R root.root "$startdir/src"
+ chown -R root.root "$srcdir"
fi
fi
@@ -1175,11 +1175,11 @@ if [ "$NOBUILD" = "1" ]; then
exit 0
else
# check for existing pkg directory; don't remove if we are repackaging
- if [ -d "$startdir/pkg" -a "$REPKG" = "0" ]; then
+ if [ -d "$pkgdir" -a "$REPKG" = "0" ]; then
msg "$(gettext "Removing existing pkg/ directory...")"
- rm -rf "$startdir/pkg"
+ rm -rf "$pkgdir"
fi
- mkdir -p "$startdir/pkg"
+ mkdir -p "$pkgdir"
if [ $EUID -eq 0 ]; then
# if we are root, then we don't need to recall makepkg with fakeroot