fixed build-in-docker
This commit is contained in:
		@@ -11,25 +11,31 @@
 | 
			
		||||
## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 | 
			
		||||
 | 
			
		||||
SCHROOTNAME="$1"
 | 
			
		||||
if test -n "${SCHROOTNAME}"; then
 | 
			
		||||
  DO="schroot -c "${SCHROOTNAME}" --"
 | 
			
		||||
  SUDO="schroot -c "${SCHROOTNAME}" -u root -d / --"
 | 
			
		||||
else
 | 
			
		||||
  DO=""
 | 
			
		||||
  if grep -q '/docker/' /proc/1/cgroup; then
 | 
			
		||||
      SUDO=""
 | 
			
		||||
  else
 | 
			
		||||
      SUDO="sudo"
 | 
			
		||||
  fi
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
function install() {
 | 
			
		||||
    if test -n "${SCHROOTNAME}"; then
 | 
			
		||||
        if schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get -y install $*; then
 | 
			
		||||
            return 0
 | 
			
		||||
        fi
 | 
			
		||||
    if ${SUDO} apt-get -y install $*; then
 | 
			
		||||
        return 0
 | 
			
		||||
    else
 | 
			
		||||
        if apt-get -y install $*; then
 | 
			
		||||
            return 0
 | 
			
		||||
        fi
 | 
			
		||||
        return 1
 | 
			
		||||
    fi
 | 
			
		||||
    return 1
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
TO_INSTALL=
 | 
			
		||||
 | 
			
		||||
if test -e debian/control.in -a ! -e debian/control; then
 | 
			
		||||
    for f in $(sed -n 's, *AX_DEB_DEPEND_IFEXISTS(\([^)]*\)).*,\1,p' configure.ac); do
 | 
			
		||||
        if test -n "$(apt-cache policy -q ${f})" && ! dpkg -l "${f}"; then
 | 
			
		||||
        if test -n "$(${DO} apt-cache policy -q ${f})" && ! ${DO} dpkg -l "${f}"; then
 | 
			
		||||
            TO_INSTALL+=" ${f}"
 | 
			
		||||
        fi
 | 
			
		||||
    done
 | 
			
		||||
@@ -38,13 +44,8 @@ if test -e debian/control.in -a ! -e debian/control; then
 | 
			
		||||
        sed 's,@[^@]*@, dummytext,g' > debian/control
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
if test -n "${SCHROOTNAME}"; then
 | 
			
		||||
  schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get -y install dpkg-dev
 | 
			
		||||
  DEPS=$(schroot -c "${SCHROOTNAME}" -- dpkg-checkbuilddeps 2>&1 || true)
 | 
			
		||||
else
 | 
			
		||||
  apt-get -y install dpkg-dev
 | 
			
		||||
  DEPS=$(dpkg-checkbuilddeps 2>&1 || true)
 | 
			
		||||
fi
 | 
			
		||||
install dpkg-dev
 | 
			
		||||
DEPS=$(LANG= ${DO} dpkg-checkbuilddeps 2>&1 || true)
 | 
			
		||||
DEPS=$(echo "$DEPS" | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}')
 | 
			
		||||
 | 
			
		||||
for pa in ${DEPS}; do
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user