From 5e4bd974ebec3b2e77c700ef49657051086fb426 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Thu, 30 Mar 2023 14:56:46 +0200 Subject: [PATCH] Remove unnecessary ; from build scripts The newlines aren't stripped, so they are quite sufficient separators for the commands. --- .github/containers/bionic/build.sh | 12 ++++++------ .github/containers/centos7/build.sh | 10 +++++----- .github/containers/focal/build.sh | 12 ++++++------ .github/containers/jammy/build.sh | 12 ++++++------ .github/containers/rocky8/build.sh | 10 +++++----- .github/containers/rocky9/build.sh | 12 ++++++------ 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/containers/bionic/build.sh b/.github/containers/bionic/build.sh index 32c844f7..a170cc35 100755 --- a/.github/containers/bionic/build.sh +++ b/.github/containers/bionic/build.sh @@ -45,12 +45,12 @@ cat ${DEBDIR}/debian/changelog >> ${CURDIR}/build/debian/changelog docker run --volume ${CURDIR}/build:/home/deb/build --interactive --rm tigervnc/${DOCKER} \ bash -e -x -c " - tar -C ~/build -axf ~/build/tigervnc_${VERSION}.orig.tar.xz; - cp -a ~/build/debian ~/build/tigervnc-${VERSION}/debian; - sudo apt-get update; - mk-build-deps ~/build/tigervnc-${VERSION}/debian/control; - sudo apt-get install -y ~/tigervnc-build-deps_*.deb; - cd ~/build/tigervnc-${VERSION} && dpkg-buildpackage; + tar -C ~/build -axf ~/build/tigervnc_${VERSION}.orig.tar.xz + cp -a ~/build/debian ~/build/tigervnc-${VERSION}/debian + sudo apt-get update + mk-build-deps ~/build/tigervnc-${VERSION}/debian/control + sudo apt-get install -y ~/tigervnc-build-deps_*.deb + cd ~/build/tigervnc-${VERSION} && dpkg-buildpackage " mkdir -p ${CURDIR}/result diff --git a/.github/containers/centos7/build.sh b/.github/containers/centos7/build.sh index c26d7bcb..bc4f3828 100755 --- a/.github/containers/centos7/build.sh +++ b/.github/containers/centos7/build.sh @@ -33,11 +33,11 @@ sed -i "s/@VERSION@/${VERSION}/" ${CURDIR}/rpmbuild/SPECS/tigervnc.spec docker run --volume ${CURDIR}/rpmbuild:/home/rpm/rpmbuild --interactive --rm tigervnc/${DOCKER} \ bash -e -x -c " - sudo yum install -y xorg-x11-server-devel; - sudo yum-builddep -y ~/rpmbuild/SPECS/tigervnc.spec; - sudo chown 0.0 ~/rpmbuild/SOURCES/*; - sudo chown 0.0 ~/rpmbuild/SPECS/*; - rpmbuild -ba ~/rpmbuild/SPECS/tigervnc.spec; + sudo yum install -y xorg-x11-server-devel + sudo yum-builddep -y ~/rpmbuild/SPECS/tigervnc.spec + sudo chown 0.0 ~/rpmbuild/SOURCES/* + sudo chown 0.0 ~/rpmbuild/SPECS/* + rpmbuild -ba ~/rpmbuild/SPECS/tigervnc.spec " mkdir -p ${CURDIR}/result diff --git a/.github/containers/focal/build.sh b/.github/containers/focal/build.sh index 90ff2c4d..7bf0f186 100755 --- a/.github/containers/focal/build.sh +++ b/.github/containers/focal/build.sh @@ -45,12 +45,12 @@ cat ${DEBDIR}/debian/changelog >> ${CURDIR}/build/debian/changelog docker run --volume ${CURDIR}/build:/home/deb/build --interactive --rm tigervnc/${DOCKER} \ bash -e -x -c " - tar -C ~/build -axf ~/build/tigervnc_${VERSION}.orig.tar.xz; - cp -a ~/build/debian ~/build/tigervnc-${VERSION}/debian; - sudo apt-get update; - mk-build-deps ~/build/tigervnc-${VERSION}/debian/control; - sudo apt-get install -y ~/tigervnc-build-deps_*.deb; - cd ~/build/tigervnc-${VERSION} && dpkg-buildpackage; + tar -C ~/build -axf ~/build/tigervnc_${VERSION}.orig.tar.xz + cp -a ~/build/debian ~/build/tigervnc-${VERSION}/debian + sudo apt-get update + mk-build-deps ~/build/tigervnc-${VERSION}/debian/control + sudo apt-get install -y ~/tigervnc-build-deps_*.deb + cd ~/build/tigervnc-${VERSION} && dpkg-buildpackage " mkdir -p ${CURDIR}/result diff --git a/.github/containers/jammy/build.sh b/.github/containers/jammy/build.sh index 8d40ebdc..dc0722ef 100755 --- a/.github/containers/jammy/build.sh +++ b/.github/containers/jammy/build.sh @@ -45,12 +45,12 @@ cat ${DEBDIR}/debian/changelog >> ${CURDIR}/build/debian/changelog docker run --volume ${CURDIR}/build:/home/deb/build --interactive --rm tigervnc/${DOCKER} \ bash -e -x -c " - tar -C ~/build -axf ~/build/tigervnc_${VERSION}.orig.tar.xz; - cp -a ~/build/debian ~/build/tigervnc-${VERSION}/debian; - sudo apt-get update; - mk-build-deps ~/build/tigervnc-${VERSION}/debian/control; - sudo apt-get install -y ~/tigervnc-build-deps_*.deb; - cd ~/build/tigervnc-${VERSION} && dpkg-buildpackage; + tar -C ~/build -axf ~/build/tigervnc_${VERSION}.orig.tar.xz + cp -a ~/build/debian ~/build/tigervnc-${VERSION}/debian + sudo apt-get update + mk-build-deps ~/build/tigervnc-${VERSION}/debian/control + sudo apt-get install -y ~/tigervnc-build-deps_*.deb + cd ~/build/tigervnc-${VERSION} && dpkg-buildpackage " mkdir -p ${CURDIR}/result diff --git a/.github/containers/rocky8/build.sh b/.github/containers/rocky8/build.sh index d56eb62c..e33b7776 100755 --- a/.github/containers/rocky8/build.sh +++ b/.github/containers/rocky8/build.sh @@ -33,11 +33,11 @@ sed -i "s/@VERSION@/${VERSION}/" ${CURDIR}/rpmbuild/SPECS/tigervnc.spec docker run --volume ${CURDIR}/rpmbuild:/home/rpm/rpmbuild --interactive --rm tigervnc/${DOCKER} \ bash -e -x -c " - sudo dnf install -y xorg-x11-server-devel; - sudo dnf builddep -y ~/rpmbuild/SPECS/tigervnc.spec; - sudo chown 0.0 ~/rpmbuild/SOURCES/*; - sudo chown 0.0 ~/rpmbuild/SPECS/*; - rpmbuild -ba ~/rpmbuild/SPECS/tigervnc.spec; + sudo dnf install -y xorg-x11-server-devel + sudo dnf builddep -y ~/rpmbuild/SPECS/tigervnc.spec + sudo chown 0.0 ~/rpmbuild/SOURCES/* + sudo chown 0.0 ~/rpmbuild/SPECS/* + rpmbuild -ba ~/rpmbuild/SPECS/tigervnc.spec " mkdir -p ${CURDIR}/result diff --git a/.github/containers/rocky9/build.sh b/.github/containers/rocky9/build.sh index 781889b3..0284ff1f 100755 --- a/.github/containers/rocky9/build.sh +++ b/.github/containers/rocky9/build.sh @@ -33,12 +33,12 @@ sed -i "s/@VERSION@/${VERSION}/" ${CURDIR}/rpmbuild/SPECS/tigervnc.spec docker run --volume ${CURDIR}/rpmbuild:/home/rpm/rpmbuild --interactive --rm tigervnc/${DOCKER} \ bash -e -x -c " - sudo dnf install -y xorg-x11-server-devel; - sudo dnf install -y https://kojihub.stream.centos.org/kojifiles/packages/xorg-x11-font-utils/7.5/53.el9/x86_64/xorg-x11-font-utils-7.5-53.el9.x86_64.rpm; - sudo dnf builddep -y ~/rpmbuild/SPECS/tigervnc.spec; - sudo chown 0.0 ~/rpmbuild/SOURCES/*; - sudo chown 0.0 ~/rpmbuild/SPECS/*; - rpmbuild -ba ~/rpmbuild/SPECS/tigervnc.spec; + sudo dnf install -y xorg-x11-server-devel + sudo dnf install -y https://kojihub.stream.centos.org/kojifiles/packages/xorg-x11-font-utils/7.5/53.el9/x86_64/xorg-x11-font-utils-7.5-53.el9.x86_64.rpm + sudo dnf builddep -y ~/rpmbuild/SPECS/tigervnc.spec + sudo chown 0.0 ~/rpmbuild/SOURCES/* + sudo chown 0.0 ~/rpmbuild/SPECS/* + rpmbuild -ba ~/rpmbuild/SPECS/tigervnc.spec " mkdir -p ${CURDIR}/result -- 2.39.5