From 7930a77eaaf3df483742ffc251554d11fc946c93 Mon Sep 17 00:00:00 2001 From: DRC Date: Fri, 22 Aug 2014 17:21:09 +0000 Subject: [PATCH] Don't use sudo when building a Debian package unless the user is non-root git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.3.x@1381 632fc199-4ca6-4c93-a231-07263d6284db --- release/makedpkg.in | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/release/makedpkg.in b/release/makedpkg.in index 448e4cdd..80cc89bd 100644 --- a/release/makedpkg.in +++ b/release/makedpkg.in @@ -7,14 +7,20 @@ trap onexit TERM trap onexit EXIT TMPDIR= +SUDO= onexit() { if [ ! "$TMPDIR" = "" ]; then - sudo rm -rf $TMPDIR + $SUDO rm -rf $TMPDIR fi } +uid() +{ + id | cut -f2 -d = | cut -f1 -d \(; +} + makedeb() { SUPPLEMENT=$1 @@ -53,7 +59,7 @@ makedeb() /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 } @@ -66,6 +72,10 @@ PREFIX=%{__prefix} DOCDIR=%{__docdir} LIBDIR=%{__libdir} +if [ ! `uid` -eq 0 ]; then + SUDO=sudo +fi + makedeb 0 if [ "$DEBARCH" = "i386" ]; then makedeb 1; fi