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

makepkg: switch applicable $startdir/dir refs to new variable names

Browse Source 
After introducing $pkgdir and $srcdir, we can switch some lookups to
these new variables.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2007-05-31 00:02:32 -04:00
parent 92a14eab59
commit 90a307bfa3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/makepkg.in
View File

@ -399,7 +399,7 @@ run_build() {
fi fi
msg "$(gettext "Starting build()...")" msg "$(gettext "Starting build()...")"
cd "$startdir"/src cd "$srcdir"
# ensure we have a sane umask set # ensure we have a sane umask set
umask 0022 umask 0022
@ -444,7 +444,7 @@ run_build() {
} }
tidy_install() { tidy_install() {
cd "$startdir"/pkg cd "$pkgdir"
msg "$(gettext "Tidying install...")" msg "$(gettext "Tidying install...")"
if [ "$(check_option docs)" = "n" ]; then if [ "$(check_option docs)" = "n" ]; then
@ -507,7 +507,7 @@ create_package() {
exit 1 # $E_MISSING_PKGDIR # TODO: error code exit 1 # $E_MISSING_PKGDIR # TODO: error code
fi fi
cd "$startdir"/pkg cd "$pkgdir"
msg "$(gettext "Creating package...")" msg "$(gettext "Creating package...")"
local builddate=$(LC_ALL= LANG= date -u "+%a %b %e %H:%M:%S %Y") local builddate=$(LC_ALL= LANG= date -u "+%a %b %e %H:%M:%S %Y")
@ -995,7 +995,7 @@ fi
cd "$startdir" cd "$startdir"
mkdir -p src mkdir -p src
cd "$startdir/src" cd "$srcdir"
msg "$(gettext "Retrieving Sources...")" msg "$(gettext "Retrieving Sources...")"
for netfile in ${source[@]}; do for netfile in ${source[@]}; do
@ -1166,7 +1166,7 @@ else
if [ "$EUID" = "0" ]; then if [ "$EUID" = "0" ]; then
# chown all source files to root.root # chown all source files to root.root
chown -R root.root "$startdir/src" chown -R root.root "$srcdir"
fi fi
fi fi
@ -1175,11 +1175,11 @@ if [ "$NOBUILD" = "1" ]; then
exit 0 exit 0
else else
# check for existing pkg directory; don't remove if we are repackaging # 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...")" msg "$(gettext "Removing existing pkg/ directory...")"
rm -rf "$startdir/pkg" rm -rf "$pkgdir"
fi fi
mkdir -p "$startdir/pkg" mkdir -p "$pkgdir"
if [ $EUID -eq 0 ]; then if [ $EUID -eq 0 ]; then
# if we are root, then we don't need to recall makepkg with fakeroot # if we are root, then we don't need to recall makepkg with fakeroot