Remove unnecessary ; from build scripts

The newlines aren't stripped, so they are quite sufficient separators
for the commands.

diff --git a/.github/containers/bionic/build.sh b/.github/containers/bionic/build.sh
index 32c844f7ede8185f6865fa9791c0d5dc910cc482..a170cc35aabf7a29aae63a68d8518212f7eda3a8 100755 (executable)
--- 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 c26d7bcb5728b4961c81a63ec0020312b48f1f44..bc4f3828e009314144905d31b44a021f925ad7d5 100755 (executable)
--- 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 90ff2c4de06c685c3e615ed9d4cf1636d7cd1e7c..7bf0f18679bd5c89349ec1e1096b1ab65e090f02 100755 (executable)
--- 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 8d40ebdc69e45de7c07bcaa0d52b1570515001a2..dc0722ef956c400ad6fd4a0adb6e373268aa68e0 100755 (executable)
--- 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 d56eb62c11cc56a29e59718270108834a0523401..e33b7776fb0758eeb68c75368daa141b5f9a2e59 100755 (executable)
--- 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 781889b32844374d8a679473b58eaf130a0f8a3c..0284ff1f7915ddae15029323cc67b42c1e298367 100755 (executable)
--- 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