summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAndrew Fyfe <andrew@neptune-one.net>2007-04-11 20:06:36 +0100
committerDan McGee <dan@archlinux.org>2007-05-27 16:10:24 -0400
commitbc6ce2a1901b0880c95498ab28d9f68f1f85c2d4 (patch)
tree4d3ae54c4e9cf9d8f3a86405c2db154aeabc4896 /scripts
parent9ff52db3dbff32f1046bc3ee523cfa70f96c4298 (diff)
downloadpacman-bc6ce2a1901b0880c95498ab28d9f68f1f85c2d4.tar.xz
Removed fakeroot hacks.
Removed fakeroot hacks from * handledeps() * removedeps() * installpackage() Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/makepkg.in31
1 files changed, 2 insertions, 29 deletions
diff --git a/scripts/makepkg.in b/scripts/makepkg.in
index cac73b0d..6bba36bc 100755
--- a/scripts/makepkg.in
+++ b/scripts/makepkg.in
@@ -235,7 +235,7 @@ handledeps() {
local depstrip=""
local striplist=""
local haveperm=0
- if [ \( "$EUID" = "0" -a "$INFAKEROOT" != "1" \) -o "$SUDO" = 1 ]; then
+ if [ "$EUID" = "0" -o "$SUDO" = 1 ]; then
haveperm=1
fi
@@ -248,21 +248,11 @@ handledeps() {
if [ "$DEP_BIN" = "1" -a "$SUDO" = "1" ]; then
# install missing deps from binary packages (using pacman -S and sudo)
msg "$(gettext "Installing missing dependencies...")"
- if [ "$INFAKEROOT" = "1" ]; then
- # kinda hacky, but we need to make pacman think that we're NOT
- # in fakeroot so it will go ahead and install the dependencies.
- FAKEROOTKEY2=$FAKEROOTKEY
- unset FAKEROOTKEY
- fi
sudo pacman $PACMAN_OPTS -S $striplist
if [ $? -eq 1 ]; then
error "$(gettext "Pacman failed to install missing dependencies.")"
exit 1
fi
- if [ "$INFAKEROOT" = "1" ]; then
- export FAKEROOTKEY=$FAKEROOTKEY2
- unset FAKEROOTKEY2
- fi
elif [ "$DEP_BIN" = "1" ]; then
# install missing deps from binary packages (using pacman -S)
msg "$(gettext "Installing missing dependencies...")"
@@ -372,15 +362,7 @@ removedeps() {
if [ "$RMDEPS" = "1" -a "$SUDO" = "1" -a -n "$deplist" ]; then
msg "$(gettext "Removing installed dependencies...")"
- if [ "$INFAKEROOT" = "1" ]; then
- export FAKEROOTKEY2=$FAKEROOTKEY
- unset FAKEROOTKEY
- fi
sudo pacman $PACMAN_OPTS -Rs $striplist
- if [ "$INFAKEROOT" = "1" ]; then
- export FAKEROOTKEY=$FAKEROOTKEY2
- unset FAKEROOTKEY2
- fi
elif [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a -n "$deplist" ]; then
msg "$(gettext "Removing installed dependencies...")"
pacman $PACMAN_OPTS -Rs $striplist
@@ -603,17 +585,8 @@ create_package() {
installpackage() {
if [ "$INSTALL" = "1" -a "$SUDO" = "1" ]; then
msg "$(gettext "Installing package with pacman -U...")"
- if [ "$INFAKEROOT" = "1" ]; then
- FAKEROOTKEY2=$FAKEROOTKEY
- unset FAKEROOTKEY
- fi
sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT}
- local exitcode=$?
- if [ "$INFAKEROOT" = "1" ]; then
- export FAKEROOTKEY=$FAKEROOTKEY2
- unset FAKEROOTKEY2
- fi
- exit $exitcode
+ exit $?
elif [ "$INSTALL" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" ]; then
msg "$(gettext "Installing package with pacman -U...")"
pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT}