ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use sudo when building a Debian package unless the user is non-root

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.3.x@1381 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2014-08-22 17:21:09 +00:00
parent cdeb7db034
commit 7930a77eaa
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
release/makedpkg.in
View File

@@ -7,14 +7,20 @@ trap onexit TERM
trap onexit EXIT trap onexit EXIT
TMPDIR= TMPDIR=
SUDO=
onexit() onexit()
{ {
if [ ! "$TMPDIR" = "" ]; then if [ ! "$TMPDIR" = "" ]; then
sudo rm -rf $TMPDIR $SUDO rm -rf $TMPDIR
fi fi
} }
uid()
{
id | cut -f2 -d = | cut -f1 -d \(;
}
makedeb() makedeb()
{ {
SUPPLEMENT=$1 SUPPLEMENT=$1
@@ -53,7 +59,7 @@ makedeb()
/sbin/ldconfig -n $TMPDIR$LIBDIR /sbin/ldconfig -n $TMPDIR$LIBDIR
sudo chown -Rh root:root $TMPDIR/* $SUDO chown -Rh root:root $TMPDIR/*
dpkg -b $TMPDIR $PACKAGE_NAME\_$VERSION\_$DEBARCH.deb dpkg -b $TMPDIR $PACKAGE_NAME\_$VERSION\_$DEBARCH.deb
} }
@@ -66,6 +72,10 @@ PREFIX=%{__prefix}
DOCDIR=%{__docdir} DOCDIR=%{__docdir}
LIBDIR=%{__libdir} LIBDIR=%{__libdir}
if [ ! `uid` -eq 0 ]; then
SUDO=sudo
fi
makedeb 0 makedeb 0
if [ "$DEBARCH" = "i386" ]; then makedeb 1; fi if [ "$DEBARCH" = "i386" ]; then makedeb 1; fi