From 99b12cb4d9d0d5ab8b7ff1fd33ddaa410fa3ba53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Tue, 23 Oct 2018 21:21:13 +0000 Subject: [PATCH] update buildsystem --- build-in-docker.sh | 10 +++++----- mac-create-app-bundle.sh | 2 +- resolve-rpmbuilddeps.sh | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build-in-docker.sh b/build-in-docker.sh index a53edc7..583cf9f 100755 --- a/build-in-docker.sh +++ b/build-in-docker.sh @@ -275,12 +275,12 @@ case "$mode" in PREVENT='libpam-systemd policykit.* colord dconf-service' docker exec ${DOCKER_ID} apt-get update ${OPTIONS} docker exec ${DOCKER_ID} apt-mark hold ${PREVENT} - docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS} + #docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS} docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release wget || \ docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- software-properties-common apt-transport-https dpkg-dev lsb-release wget || \ docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- python-software-properties apt-transport-https dpkg-dev lsb-release wget; if [[ "${img}" =~ "ubuntu" ]]; then - docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT} locales + docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- locales docker exec ${DOCKER_ID} locale-gen ${LANG} docker exec ${DOCKER_ID} update-locale LANG=${LANG} fi @@ -290,7 +290,7 @@ case "$mode" in docker exec ${DOCKER_ID} bash -c "echo >> /etc/apt/preferences" done if test -n "${keys[@]}"; then # fix dependency bug in cosmic and stretch - docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT} gnupg + docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- gnupg for key in "${keys[@]}"; do wget -O- "$key" \ | docker exec -i ${DOCKER_ID} apt-key add - @@ -302,7 +302,7 @@ case "$mode" in docker exec ${DOCKER_ID} apt-get update ${OPTIONS} for package in "${packages[@]}"; do - ifthenelse "${package}" "apt-get install ${OPTIONS} ${PREVENT} ARG" + ifthenelse "${package}" "apt-get install ${OPTIONS} ${PREVENT// /- }- ARG" done for command in "${commands[@]}"; do ifthenelse "${command}" "ARG" @@ -363,7 +363,7 @@ docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -t "${targets}" ${h # not supported in trusty and jessie if test "$mode" = deb -a "${img//trusty/}" = "${img}" -a "${img//jessie/}" = "${img}"; then if test "${targets//deb/}" != "${targets}" && ls *.deb > /dev/null 2> /dev/null; then - docker exec ${DOCKER_ID} bash -c "apt-get install ${OPTIONS} ${PREVENT} /workdir/*.deb" + docker exec ${DOCKER_ID} bash -c "apt-get install ${OPTIONS} ${PREVENT// /- }- /workdir/*.deb" fi fi if test "$mode" = rpm -a "${targets//rpm/}" != "${targets}"; then diff --git a/mac-create-app-bundle.sh b/mac-create-app-bundle.sh index 8eb3598..e517657 100755 --- a/mac-create-app-bundle.sh +++ b/mac-create-app-bundle.sh @@ -59,7 +59,7 @@ while [ $found -ne 0 ]; do cd "${target}" for file in $(find . -type f); do for lib in $(otool -L ${file} | tail -n +2 \ - | egrep '/usr/local/|/opt/local/|'"${HOME}" \ + | egrep '/usr/local/|/opt/local/|/opt/X11/|'"${HOME}" \ | grep -v $file | awk '{print $1}'); do found=1 test -f ${lib##*/} \ diff --git a/resolve-rpmbuilddeps.sh b/resolve-rpmbuilddeps.sh index 56bfd4f..08b4645 100755 --- a/resolve-rpmbuilddeps.sh +++ b/resolve-rpmbuilddeps.sh @@ -97,12 +97,12 @@ fi if test -n "${SCHROOTNAME}"; then FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p') - if test -n "${FILES}${DEPS}"; then + if test -n "${FILES// /}${DEPS// /}"; then schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL} ${FILES} ${DEPS} fi else FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p') - if test -n "${FILES}${DEPS}"; then + if test -n "${FILES// /}${DEPS// /}"; then ${INSTALL_TOOL} ${FILES} ${DEPS} fi fi @@ -112,7 +112,7 @@ if test -n "${SCHROOTNAME}"; then else FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p') fi -if test -n "${FILES}"; then +if test -n "${FILES// /}"; then echo "**** ERROR: Cannot install: " $FILES exit 1 fi