From e3a167e42f7d8a9079f6eb5af0403ccccd1bab98 Mon Sep 17 00:00:00 2001 From: "Douglas Cerna (Soy Douglas)" Date: Wed, 24 Jan 2024 22:17:25 +0100 Subject: [PATCH] Add more pre-commit hooks --- .github/workflows/vagrant-box-archivematica.yml | 2 +- .github/workflows/vagrant-box-atom.yml | 2 +- .pre-commit-config.yaml | 3 +++ debs/bionic/acmetool/Makefile | 2 +- debs/bionic/acmetool/debian/rules | 2 +- debs/bionic/archivematica-storage-service/build.sh | 4 ++-- debs/bionic/archivematica-storage-service/changelog.sh | 2 +- .../archivematica-storage-service.service | 2 +- debs/bionic/bulk_extractor/Makefile | 4 ++-- debs/bionic/bulk_extractor/debian/control | 5 ++--- debs/bionic/fits/Makefile | 4 ++-- debs/bionic/fits/debian/copyright | 2 +- .../bionic/fits/debian/patches/archivematica-config.diff | 4 ++-- debs/bionic/fits/debian/patches/changehome.diff | 4 ++-- debs/bionic/fits/debian/patches/fits-logging.diff | 6 +++--- .../debian/patches/fits-ngserver-logging-and-maxmem.diff | 9 ++++----- debs/bionic/jhove/Makefile | 2 +- debs/focal/bulk_extractor/Makefile | 4 ++-- debs/focal/bulk_extractor/debian/control | 3 +-- debs/focal/fits/Makefile | 4 ++-- debs/focal/fits/debian/copyright | 2 +- debs/focal/fits/debian/patches/archivematica-config.diff | 4 ++-- debs/focal/fits/debian/patches/changehome.diff | 4 ++-- debs/focal/fits/debian/patches/fits-logging.diff | 6 +++--- .../debian/patches/fits-ngserver-logging-and-maxmem.diff | 9 ++++----- debs/focal/jhove/Makefile | 2 +- debs/focal/temporal-ui/debian/rules | 2 +- debs/jammy/archivematica-storage-service/build.sh | 4 ++-- debs/jammy/archivematica-storage-service/changelog.sh | 2 +- .../archivematica-storage-service.service | 2 +- debs/jammy/bulk_extractor/Makefile | 4 ++-- debs/jammy/bulk_extractor/debian/control | 3 +-- debs/jammy/fits/Makefile | 4 ++-- debs/jammy/fits/debian/copyright | 2 +- debs/jammy/fits/debian/patches/archivematica-config.diff | 4 ++-- debs/jammy/fits/debian/patches/changehome.diff | 4 ++-- debs/jammy/fits/debian/patches/fits-logging.diff | 6 +++--- .../debian/patches/fits-ngserver-logging-and-maxmem.diff | 9 ++++----- debs/jammy/jhove/Makefile | 2 +- debs/jammy/temporal-ui/debian/rules | 2 +- debs/siegfried/files/golang.pm | 2 +- packer/scripts/common/minimize.sh | 4 ++-- rpms/EL8/cadence-web/Dockerfile | 2 +- rpms/EL8/external-packages/external-packages.sh | 2 +- rpms/EL8/fits/files/fits-enable-toolOutput.patch | 4 ++-- rpms/EL8/fits/files/fits-home.patch | 4 ++-- rpms/EL8/fits/files/fits-logging.patch | 6 +++--- rpms/EL8/nailgun/Dockerfile | 2 +- rpms/EL8/nailgun/files/change-client-name.patch | 4 ++-- rpms/EL8/nailgun/files/makefile-change-client-name.patch | 4 ++-- rpms/EL9/archivematica-storage-service/package.spec | 2 +- rpms/EL9/cadence-web/Dockerfile | 2 +- rpms/EL9/fits/files/fits-enable-toolOutput.patch | 4 ++-- rpms/EL9/fits/files/fits-home.patch | 4 ++-- rpms/EL9/fits/files/fits-logging.patch | 6 +++--- rpms/EL9/nailgun/Dockerfile | 2 +- rpms/EL9/nailgun/files/change-client-name.patch | 4 ++-- rpms/EL9/nailgun/files/makefile-change-client-name.patch | 4 ++-- tools/aptversion.py | 2 +- 59 files changed, 104 insertions(+), 107 deletions(-) diff --git a/.github/workflows/vagrant-box-archivematica.yml b/.github/workflows/vagrant-box-archivematica.yml index ae780d8e..2d81a198 100644 --- a/.github/workflows/vagrant-box-archivematica.yml +++ b/.github/workflows/vagrant-box-archivematica.yml @@ -8,7 +8,7 @@ on: description: description: Description required: true -jobs: +jobs: vagrant-box-archivematica: name: Build and upload runs-on: macos-latest diff --git a/.github/workflows/vagrant-box-atom.yml b/.github/workflows/vagrant-box-atom.yml index 5adf26db..7d49bbae 100644 --- a/.github/workflows/vagrant-box-atom.yml +++ b/.github/workflows/vagrant-box-atom.yml @@ -8,7 +8,7 @@ on: description: description: Description required: true -jobs: +jobs: vagrant-box-atom: name: Build and upload runs-on: macos-10.15 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7c6d777c..c930cae7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,10 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.5.0 hooks: + - id: check-json + - id: check-yaml - id: end-of-file-fixer + - id: trailing-whitespace - repo: https://github.com/igorshubovych/markdownlint-cli rev: v0.38.0 hooks: diff --git a/debs/bionic/acmetool/Makefile b/debs/bionic/acmetool/Makefile index c125d9de..6242bd1e 100644 --- a/debs/bionic/acmetool/Makefile +++ b/debs/bionic/acmetool/Makefile @@ -38,7 +38,7 @@ deb-build: deb-clean cd /debbuild/$(NAME) && dpkg-buildpackage -k$(GPG_ID) @echo "==> Copying built files." mkdir -p $(DOCKER_VOLUME)/build/ - cp $(DEB_TOPDIR)/*.* $(DOCKER_VOLUME)/build/ + cp $(DEB_TOPDIR)/*.* $(DOCKER_VOLUME)/build/ deb-clean: @echo "==> Cleaning up previous builds." diff --git a/debs/bionic/acmetool/debian/rules b/debs/bionic/acmetool/debian/rules index a3a3a025..0e3004ef 100755 --- a/debs/bionic/acmetool/debian/rules +++ b/debs/bionic/acmetool/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/dpkg/default.mk -include /usr/share/dpkg/vendor.mk +include /usr/share/dpkg/vendor.mk # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 diff --git a/debs/bionic/archivematica-storage-service/build.sh b/debs/bionic/archivematica-storage-service/build.sh index e427e056..cfe584d7 100755 --- a/debs/bionic/archivematica-storage-service/build.sh +++ b/debs/bionic/archivematica-storage-service/build.sh @@ -13,7 +13,7 @@ COMMIT=$(git rev-parse HEAD) cp -rf ${BASE}/debian-storage-service debian yes | mk-build-deps -i debian/control dch -v 1:${VERSION}${RELEASE}~18.04 commit: $(echo $COMMIT) -dch -v 1:${VERSION}${RELEASE}~18.04 checkout: $(echo $BRANCH) -dch -r --distribution bionic --urgency high ignored +dch -v 1:${VERSION}${RELEASE}~18.04 checkout: $(echo $BRANCH) +dch -r --distribution bionic --urgency high ignored dpkg-buildpackage -us -uc cd $SOURCE diff --git a/debs/bionic/archivematica-storage-service/changelog.sh b/debs/bionic/archivematica-storage-service/changelog.sh index 36977640..2a7893c4 100755 --- a/debs/bionic/archivematica-storage-service/changelog.sh +++ b/debs/bionic/archivematica-storage-service/changelog.sh @@ -6,5 +6,5 @@ BRANCH="$(git branch | cut -d\ -f2-)" COMMIT=$(git rev-parse HEAD) dch -v 1:${VERSION}${RELEASE} commit: $(echo $COMMIT) -dch -v 1:${VERSION}${RELEASE} checkout: $(echo $BRANCH) +dch -v 1:${VERSION}${RELEASE} checkout: $(echo $BRANCH) dch -r --distribution bionic --urgency high ignored diff --git a/debs/bionic/archivematica-storage-service/debian-storage-service/archivematica-storage-service.service b/debs/bionic/archivematica-storage-service/debian-storage-service/archivematica-storage-service.service index 0872ae3c..88c22ebf 100644 --- a/debs/bionic/archivematica-storage-service/debian-storage-service/archivematica-storage-service.service +++ b/debs/bionic/archivematica-storage-service/debian-storage-service/archivematica-storage-service.service @@ -13,7 +13,7 @@ WorkingDirectory=/usr/lib/archivematica/storage-service/ ExecStart=/usr/share/archivematica/virtualenvs/archivematica-storage-service/bin/gunicorn --config /etc/archivematica/storage-service.gunicorn-config.py storage_service.wsgi:application ExecReload=/bin/kill -s HUP $MAINPID ExecStop=/bin/kill -s TERM $MAINPID -PrivateTmp=true +PrivateTmp=true Restart=always RestartSec=30 diff --git a/debs/bionic/bulk_extractor/Makefile b/debs/bionic/bulk_extractor/Makefile index 5dea55c6..2bcdd36b 100644 --- a/debs/bionic/bulk_extractor/Makefile +++ b/debs/bionic/bulk_extractor/Makefile @@ -36,10 +36,10 @@ deb-build: deb-clean @echo "==> Run bootstrap.sh." cd /debbuild/$(NAME) && sh bootstrap.sh @echo "==> Build package." - cd /debbuild/$(NAME) && dpkg-buildpackage + cd /debbuild/$(NAME) && dpkg-buildpackage @echo "==> Copying built files." mkdir -p $(DOCKER_VOLUME)/build/ - cp $(DEB_TOPDIR)/*.* $(DOCKER_VOLUME)/build/ + cp $(DEB_TOPDIR)/*.* $(DOCKER_VOLUME)/build/ deb-clean: @echo "===> Install gpg key" diff --git a/debs/bionic/bulk_extractor/debian/control b/debs/bionic/bulk_extractor/debian/control index 2b6665dd..e7fe1898 100644 --- a/debs/bionic/bulk_extractor/debian/control +++ b/debs/bionic/bulk_extractor/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: extra Maintainer: Artefactual Systems Inc. Standards-Version: 3.9.3 -Build-Depends: +Build-Depends: debhelper (>= 9), dh-autoreconf, build-essential, @@ -20,5 +20,4 @@ Build-Depends: Package: bulk-extractor Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Bulk Extractor (bulk_extractor) is a feature extraction tool written in C++ for extracting features from media images. Extracted features are stored in feature files that can be easily inspected, parsed, or processed with automated tools. - +Description: Bulk Extractor (bulk_extractor) is a feature extraction tool written in C++ for extracting features from media images. Extracted features are stored in feature files that can be easily inspected, parsed, or processed with automated tools. diff --git a/debs/bionic/fits/Makefile b/debs/bionic/fits/Makefile index d05b34fd..7c108431 100644 --- a/debs/bionic/fits/Makefile +++ b/debs/bionic/fits/Makefile @@ -31,7 +31,7 @@ deb-build: deb-clean if [ -f "$(DOCKER_VOLUME)/GPG-KEY" ]; then gpg --import $(DOCKER_VOLUME)/GPG-KEY; fi if [ x"$$GPG_KEY" != x ]; then echo "$$GPG_KEY" | gpg --import - ; fi @echo "==> Apply patches." - cd /debbuild/$(NAME) && QUILT_PATCHES=debian/patches/ quilt push -a + cd /debbuild/$(NAME) && QUILT_PATCHES=debian/patches/ quilt push -a @echo "==> Install dependencies." cd /debbuild/$(NAME) && yes | mk-build-deps --install debian/control @echo "==> Update changelog." @@ -40,7 +40,7 @@ deb-build: deb-clean cd /debbuild/$(NAME) && dpkg-buildpackage -k$(GPG_ID) @echo "==> Copying built files." mkdir -p $(DOCKER_VOLUME)/build/ - cp $(DEB_TOPDIR)/*.* $(DOCKER_VOLUME)/build/ + cp $(DEB_TOPDIR)/*.* $(DOCKER_VOLUME)/build/ deb-clean: @echo "==> Cleaning up previous RPMs builds." diff --git a/debs/bionic/fits/debian/copyright b/debs/bionic/fits/debian/copyright index e746fcbc..7502f7a0 100644 --- a/debs/bionic/fits/debian/copyright +++ b/debs/bionic/fits/debian/copyright @@ -28,7 +28,7 @@ The Debian packaging is: # packaged work, as it may make Debian's contributions unacceptable upstream. # If you just want it to be GPL version 3, leave the following lines in. -and is licensed under the GPL version 3, +and is licensed under the GPL version 3, see `/usr/share/common-licenses/GPL-3'. # Please also look if there are files or directories which have a diff --git a/debs/bionic/fits/debian/patches/archivematica-config.diff b/debs/bionic/fits/debian/patches/archivematica-config.diff index e41210c1..78d47383 100644 --- a/debs/bionic/fits/debian/patches/archivematica-config.diff +++ b/debs/bionic/fits/debian/patches/archivematica-config.diff @@ -22,12 +22,12 @@ Index: fits/xml/fits.xml + + - + - false + true - true + true - false + true xml/fits_output.xsd diff --git a/debs/bionic/fits/debian/patches/changehome.diff b/debs/bionic/fits/debian/patches/changehome.diff index 70bef3d1..ad1a5152 100644 --- a/debs/bionic/fits/debian/patches/changehome.diff +++ b/debs/bionic/fits/debian/patches/changehome.diff @@ -5,8 +5,8 @@ Index: fits/fits-env.sh @@ -17,7 +17,7 @@ while [ -h "$FITS_ENV_SCRIPT" ] ; do fi done - + -FITS_HOME=`dirname $FITS_ENV_SCRIPT` +FITS_HOME="/usr/share/fits" - + export FITS_HOME diff --git a/debs/bionic/fits/debian/patches/fits-logging.diff b/debs/bionic/fits/debian/patches/fits-logging.diff index d0f6453e..5d9851ee 100644 --- a/debs/bionic/fits/debian/patches/fits-logging.diff +++ b/debs/bionic/fits/debian/patches/fits-logging.diff @@ -3,10 +3,10 @@ Index: fits/fits.sh --- fits.orig/fits.sh +++ fits/fits.sh @@ -16,6 +16,6 @@ done - + . "$(dirname $FITS_SCRIPT)/fits-env.sh" - + -cmd="java -classpath \"$APPCLASSPATH\" edu.harvard.hul.ois.fits.Fits $args" +cmd="java -Dlog4j.configuration=file:\"$FITS_HOME\"/log4j.properties -classpath \"$APPCLASSPATH\" edu.harvard.hul.ois.fits.Fits $args" - + eval "exec $cmd" diff --git a/debs/bionic/fits/debian/patches/fits-ngserver-logging-and-maxmem.diff b/debs/bionic/fits/debian/patches/fits-ngserver-logging-and-maxmem.diff index 3157b1f6..c6353046 100644 --- a/debs/bionic/fits/debian/patches/fits-ngserver-logging-and-maxmem.diff +++ b/debs/bionic/fits/debian/patches/fits-ngserver-logging-and-maxmem.diff @@ -5,18 +5,17 @@ Index: fits/fits-ngserver.sh @@ -6,6 +6,8 @@ # The one required parameter is the path to nailgun's jar; it can also be # specified via the NAILGUN_JAR environment variable. - + +test -r /etc/default/fits && . /etc/default/fits + . "$(dirname $BASH_SOURCE)/fits-env.sh" - + if [[ ! $NAILGUN_JAR ]] && [[ ! $1 ]]; then @@ -17,7 +19,7 @@ NAILGUN_JAR=$1 fi - + -cmd="java -classpath \"$APPCLASSPATH:$NAILGUN_JAR\" com.martiansoftware.nailgun.NGServer" +cmd="java -Xms${MAX_JAVA_HEAP_SIZE} -Xmx${MAX_JAVA_HEAP_SIZE} -XX:MaxMetaspaceSize=\"${MAX_JAVA_HEAP_SIZE}\" -Dlog4j.configuration=file:\"$FITS_HOME\"/log4j.properties -classpath \"$APPCLASSPATH:$NAILGUN_JAR\" com.martiansoftware.nailgun.NGServer" - + echo "You may now run FITS by typing: ng edu.harvard.hul.ois.fits.Fits [options]" >&2 - diff --git a/debs/bionic/jhove/Makefile b/debs/bionic/jhove/Makefile index 2dfd8600..4f78d588 100644 --- a/debs/bionic/jhove/Makefile +++ b/debs/bionic/jhove/Makefile @@ -47,7 +47,7 @@ deb-build: deb-clean dpkg-deb --build /debbuild/$(NAME)_$(VERSION)-$(RELEASE) @echo "==> Copying built files." mkdir -p $(DOCKER_VOLUME)/build/ - cp $(DEB_TOPDIR)/*.deb $(DOCKER_VOLUME)/build/ + cp $(DEB_TOPDIR)/*.deb $(DOCKER_VOLUME)/build/ deb-clean: @echo "==> Cleaning up previous RPMs builds." diff --git a/debs/focal/bulk_extractor/Makefile b/debs/focal/bulk_extractor/Makefile index 8c81979b..89b843b9 100644 --- a/debs/focal/bulk_extractor/Makefile +++ b/debs/focal/bulk_extractor/Makefile @@ -40,10 +40,10 @@ deb-build: deb-clean @echo "==> Run bootstrap.sh." cd /debbuild/$(NAME) && sh bootstrap.sh @echo "==> Build package." - cd /debbuild/$(NAME) && dpkg-buildpackage + cd /debbuild/$(NAME) && dpkg-buildpackage @echo "==> Copying built files." mkdir -p $(DOCKER_VOLUME)/build/ - cp $(DEB_TOPDIR)/*.* $(DOCKER_VOLUME)/build/ + cp $(DEB_TOPDIR)/*.* $(DOCKER_VOLUME)/build/ deb-clean: @echo "==> Cleaning up previous RPMs builds." diff --git a/debs/focal/bulk_extractor/debian/control b/debs/focal/bulk_extractor/debian/control index 9423d50a..f6bd2705 100644 --- a/debs/focal/bulk_extractor/debian/control +++ b/debs/focal/bulk_extractor/debian/control @@ -29,5 +29,4 @@ Build-Depends: Package: bulk-extractor Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Bulk Extractor (bulk_extractor) is a feature extraction tool written in C++ for extracting features from media images. Extracted features are stored in feature files that can be easily inspected, parsed, or processed with automated tools. - +Description: Bulk Extractor (bulk_extractor) is a feature extraction tool written in C++ for extracting features from media images. Extracted features are stored in feature files that can be easily inspected, parsed, or processed with automated tools. diff --git a/debs/focal/fits/Makefile b/debs/focal/fits/Makefile index 437036f1..891ab1a2 100644 --- a/debs/focal/fits/Makefile +++ b/debs/focal/fits/Makefile @@ -32,7 +32,7 @@ deb-build: deb-clean if [ -f "$(DOCKER_VOLUME)/GPG-KEY" ]; then gpg --import $(DOCKER_VOLUME)/GPG-KEY; fi if [ x"$$GPG_KEY" != x ]; then echo "$$GPG_KEY" | gpg --import - ; fi @echo "==> Apply patches." - cd /debbuild/$(NAME) && QUILT_PATCHES=debian/patches/ quilt push -a + cd /debbuild/$(NAME) && QUILT_PATCHES=debian/patches/ quilt push -a @echo "==> Install dependencies." cd /debbuild/$(NAME) && yes | mk-build-deps --install debian/control @echo "==> Update changelog." @@ -41,7 +41,7 @@ deb-build: deb-clean cd /debbuild/$(NAME) && dpkg-buildpackage -k$(GPG_ID) @echo "==> Copying built files." mkdir -p $(DOCKER_VOLUME)/build/ - cp $(DEB_TOPDIR)/*.* $(DOCKER_VOLUME)/build/ + cp $(DEB_TOPDIR)/*.* $(DOCKER_VOLUME)/build/ deb-clean: @echo "==> Cleaning up previous RPMs builds." diff --git a/debs/focal/fits/debian/copyright b/debs/focal/fits/debian/copyright index e746fcbc..7502f7a0 100644 --- a/debs/focal/fits/debian/copyright +++ b/debs/focal/fits/debian/copyright @@ -28,7 +28,7 @@ The Debian packaging is: # packaged work, as it may make Debian's contributions unacceptable upstream. # If you just want it to be GPL version 3, leave the following lines in. -and is licensed under the GPL version 3, +and is licensed under the GPL version 3, see `/usr/share/common-licenses/GPL-3'. # Please also look if there are files or directories which have a diff --git a/debs/focal/fits/debian/patches/archivematica-config.diff b/debs/focal/fits/debian/patches/archivematica-config.diff index e41210c1..78d47383 100644 --- a/debs/focal/fits/debian/patches/archivematica-config.diff +++ b/debs/focal/fits/debian/patches/archivematica-config.diff @@ -22,12 +22,12 @@ Index: fits/xml/fits.xml + + - + - false + true - true + true - false + true xml/fits_output.xsd diff --git a/debs/focal/fits/debian/patches/changehome.diff b/debs/focal/fits/debian/patches/changehome.diff index 70bef3d1..ad1a5152 100644 --- a/debs/focal/fits/debian/patches/changehome.diff +++ b/debs/focal/fits/debian/patches/changehome.diff @@ -5,8 +5,8 @@ Index: fits/fits-env.sh @@ -17,7 +17,7 @@ while [ -h "$FITS_ENV_SCRIPT" ] ; do fi done - + -FITS_HOME=`dirname $FITS_ENV_SCRIPT` +FITS_HOME="/usr/share/fits" - + export FITS_HOME diff --git a/debs/focal/fits/debian/patches/fits-logging.diff b/debs/focal/fits/debian/patches/fits-logging.diff index d0f6453e..5d9851ee 100644 --- a/debs/focal/fits/debian/patches/fits-logging.diff +++ b/debs/focal/fits/debian/patches/fits-logging.diff @@ -3,10 +3,10 @@ Index: fits/fits.sh --- fits.orig/fits.sh +++ fits/fits.sh @@ -16,6 +16,6 @@ done - + . "$(dirname $FITS_SCRIPT)/fits-env.sh" - + -cmd="java -classpath \"$APPCLASSPATH\" edu.harvard.hul.ois.fits.Fits $args" +cmd="java -Dlog4j.configuration=file:\"$FITS_HOME\"/log4j.properties -classpath \"$APPCLASSPATH\" edu.harvard.hul.ois.fits.Fits $args" - + eval "exec $cmd" diff --git a/debs/focal/fits/debian/patches/fits-ngserver-logging-and-maxmem.diff b/debs/focal/fits/debian/patches/fits-ngserver-logging-and-maxmem.diff index 3157b1f6..c6353046 100644 --- a/debs/focal/fits/debian/patches/fits-ngserver-logging-and-maxmem.diff +++ b/debs/focal/fits/debian/patches/fits-ngserver-logging-and-maxmem.diff @@ -5,18 +5,17 @@ Index: fits/fits-ngserver.sh @@ -6,6 +6,8 @@ # The one required parameter is the path to nailgun's jar; it can also be # specified via the NAILGUN_JAR environment variable. - + +test -r /etc/default/fits && . /etc/default/fits + . "$(dirname $BASH_SOURCE)/fits-env.sh" - + if [[ ! $NAILGUN_JAR ]] && [[ ! $1 ]]; then @@ -17,7 +19,7 @@ NAILGUN_JAR=$1 fi - + -cmd="java -classpath \"$APPCLASSPATH:$NAILGUN_JAR\" com.martiansoftware.nailgun.NGServer" +cmd="java -Xms${MAX_JAVA_HEAP_SIZE} -Xmx${MAX_JAVA_HEAP_SIZE} -XX:MaxMetaspaceSize=\"${MAX_JAVA_HEAP_SIZE}\" -Dlog4j.configuration=file:\"$FITS_HOME\"/log4j.properties -classpath \"$APPCLASSPATH:$NAILGUN_JAR\" com.martiansoftware.nailgun.NGServer" - + echo "You may now run FITS by typing: ng edu.harvard.hul.ois.fits.Fits [options]" >&2 - diff --git a/debs/focal/jhove/Makefile b/debs/focal/jhove/Makefile index e9474576..2f0a51cd 100644 --- a/debs/focal/jhove/Makefile +++ b/debs/focal/jhove/Makefile @@ -47,7 +47,7 @@ deb-build: deb-clean dpkg-deb --build /debbuild/$(NAME)_$(VERSION)-$(RELEASE) @echo "==> Copying built files." mkdir -p $(DOCKER_VOLUME)/build/ - cp $(DEB_TOPDIR)/*.deb $(DOCKER_VOLUME)/build/ + cp $(DEB_TOPDIR)/*.deb $(DOCKER_VOLUME)/build/ deb-clean: @echo "==> Cleaning up previous RPMs builds." diff --git a/debs/focal/temporal-ui/debian/rules b/debs/focal/temporal-ui/debian/rules index f5136131..73477bac 100755 --- a/debs/focal/temporal-ui/debian/rules +++ b/debs/focal/temporal-ui/debian/rules @@ -16,7 +16,7 @@ override_dh_auto_install: mv -v temporal-ui.conf.yml temporal.yml # Rename temporal-ui.conf.yml mv -v ui-server temporal-ui # Rename temporal-ui binary dh_install temporal-ui /usr/bin/ # Copy the binary in /usr/bin - dh_install temporal.yml /etc/temporal-ui/config/ + dh_install temporal.yml /etc/temporal-ui/config/ # dh_install temporal-ui.service /etc/systemd/system/ override_dh_installsystemd: diff --git a/debs/jammy/archivematica-storage-service/build.sh b/debs/jammy/archivematica-storage-service/build.sh index c82a13cf..e4e5e96a 100755 --- a/debs/jammy/archivematica-storage-service/build.sh +++ b/debs/jammy/archivematica-storage-service/build.sh @@ -13,7 +13,7 @@ COMMIT=$(git rev-parse HEAD) cp -rf ${BASE}/debian-storage-service debian yes | mk-build-deps -i debian/control dch -v 1:${VERSION}${RELEASE}~22.04 commit: $(echo $COMMIT) -dch -v 1:${VERSION}${RELEASE}~22.04 checkout: $(echo $BRANCH) -dch -r --distribution jammy --urgency high ignored +dch -v 1:${VERSION}${RELEASE}~22.04 checkout: $(echo $BRANCH) +dch -r --distribution jammy --urgency high ignored dpkg-buildpackage -us -uc cd $SOURCE diff --git a/debs/jammy/archivematica-storage-service/changelog.sh b/debs/jammy/archivematica-storage-service/changelog.sh index 7708f6a5..13be40bb 100755 --- a/debs/jammy/archivematica-storage-service/changelog.sh +++ b/debs/jammy/archivematica-storage-service/changelog.sh @@ -6,5 +6,5 @@ BRANCH="$(git branch | cut -d\ -f2-)" COMMIT=$(git rev-parse HEAD) dch -v 1:${VERSION}${RELEASE} commit: $(echo $COMMIT) -dch -v 1:${VERSION}${RELEASE} checkout: $(echo $BRANCH) +dch -v 1:${VERSION}${RELEASE} checkout: $(echo $BRANCH) dch -r --distribution jammy --urgency high ignored diff --git a/debs/jammy/archivematica-storage-service/debian-storage-service/archivematica-storage-service.service b/debs/jammy/archivematica-storage-service/debian-storage-service/archivematica-storage-service.service index 0872ae3c..88c22ebf 100644 --- a/debs/jammy/archivematica-storage-service/debian-storage-service/archivematica-storage-service.service +++ b/debs/jammy/archivematica-storage-service/debian-storage-service/archivematica-storage-service.service @@ -13,7 +13,7 @@ WorkingDirectory=/usr/lib/archivematica/storage-service/ ExecStart=/usr/share/archivematica/virtualenvs/archivematica-storage-service/bin/gunicorn --config /etc/archivematica/storage-service.gunicorn-config.py storage_service.wsgi:application ExecReload=/bin/kill -s HUP $MAINPID ExecStop=/bin/kill -s TERM $MAINPID -PrivateTmp=true +PrivateTmp=true Restart=always RestartSec=30 diff --git a/debs/jammy/bulk_extractor/Makefile b/debs/jammy/bulk_extractor/Makefile index 48f15539..4f9bcaf3 100644 --- a/debs/jammy/bulk_extractor/Makefile +++ b/debs/jammy/bulk_extractor/Makefile @@ -40,10 +40,10 @@ deb-build: deb-clean @echo "==> Run bootstrap.sh." cd /debbuild/$(NAME) && sh bootstrap.sh @echo "==> Build package." - cd /debbuild/$(NAME) && dpkg-buildpackage + cd /debbuild/$(NAME) && dpkg-buildpackage @echo "==> Copying built files." mkdir -p $(DOCKER_VOLUME)/build/ - cp $(DEB_TOPDIR)/*.* $(DOCKER_VOLUME)/build/ + cp $(DEB_TOPDIR)/*.* $(DOCKER_VOLUME)/build/ deb-clean: @echo "==> Cleaning up previous RPMs builds." diff --git a/debs/jammy/bulk_extractor/debian/control b/debs/jammy/bulk_extractor/debian/control index 4ea2ef27..fdb31fd8 100644 --- a/debs/jammy/bulk_extractor/debian/control +++ b/debs/jammy/bulk_extractor/debian/control @@ -29,5 +29,4 @@ Build-Depends: Package: bulk-extractor Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Bulk Extractor (bulk_extractor) is a feature extraction tool written in C++ for extracting features from media images. Extracted features are stored in feature files that can be easily inspected, parsed, or processed with automated tools. - +Description: Bulk Extractor (bulk_extractor) is a feature extraction tool written in C++ for extracting features from media images. Extracted features are stored in feature files that can be easily inspected, parsed, or processed with automated tools. diff --git a/debs/jammy/fits/Makefile b/debs/jammy/fits/Makefile index 1f91e5a3..1394218a 100644 --- a/debs/jammy/fits/Makefile +++ b/debs/jammy/fits/Makefile @@ -32,7 +32,7 @@ deb-build: deb-clean if [ -f "$(DOCKER_VOLUME)/GPG-KEY" ]; then gpg --import $(DOCKER_VOLUME)/GPG-KEY; fi if [ x"$$GPG_KEY" != x ]; then echo "$$GPG_KEY" | gpg --import - ; fi @echo "==> Apply patches." - cd /debbuild/$(NAME) && QUILT_PATCHES=debian/patches/ quilt push -a + cd /debbuild/$(NAME) && QUILT_PATCHES=debian/patches/ quilt push -a @echo "==> Install dependencies." cd /debbuild/$(NAME) && yes | mk-build-deps --install debian/control @echo "==> Update changelog." @@ -41,7 +41,7 @@ deb-build: deb-clean cd /debbuild/$(NAME) && dpkg-buildpackage -k$(GPG_ID) @echo "==> Copying built files." mkdir -p $(DOCKER_VOLUME)/build/ - cp $(DEB_TOPDIR)/*.* $(DOCKER_VOLUME)/build/ + cp $(DEB_TOPDIR)/*.* $(DOCKER_VOLUME)/build/ deb-clean: @echo "==> Cleaning up previous RPMs builds." diff --git a/debs/jammy/fits/debian/copyright b/debs/jammy/fits/debian/copyright index e746fcbc..7502f7a0 100644 --- a/debs/jammy/fits/debian/copyright +++ b/debs/jammy/fits/debian/copyright @@ -28,7 +28,7 @@ The Debian packaging is: # packaged work, as it may make Debian's contributions unacceptable upstream. # If you just want it to be GPL version 3, leave the following lines in. -and is licensed under the GPL version 3, +and is licensed under the GPL version 3, see `/usr/share/common-licenses/GPL-3'. # Please also look if there are files or directories which have a diff --git a/debs/jammy/fits/debian/patches/archivematica-config.diff b/debs/jammy/fits/debian/patches/archivematica-config.diff index e41210c1..78d47383 100644 --- a/debs/jammy/fits/debian/patches/archivematica-config.diff +++ b/debs/jammy/fits/debian/patches/archivematica-config.diff @@ -22,12 +22,12 @@ Index: fits/xml/fits.xml + + - + - false + true - true + true - false + true xml/fits_output.xsd diff --git a/debs/jammy/fits/debian/patches/changehome.diff b/debs/jammy/fits/debian/patches/changehome.diff index 70bef3d1..ad1a5152 100644 --- a/debs/jammy/fits/debian/patches/changehome.diff +++ b/debs/jammy/fits/debian/patches/changehome.diff @@ -5,8 +5,8 @@ Index: fits/fits-env.sh @@ -17,7 +17,7 @@ while [ -h "$FITS_ENV_SCRIPT" ] ; do fi done - + -FITS_HOME=`dirname $FITS_ENV_SCRIPT` +FITS_HOME="/usr/share/fits" - + export FITS_HOME diff --git a/debs/jammy/fits/debian/patches/fits-logging.diff b/debs/jammy/fits/debian/patches/fits-logging.diff index d0f6453e..5d9851ee 100644 --- a/debs/jammy/fits/debian/patches/fits-logging.diff +++ b/debs/jammy/fits/debian/patches/fits-logging.diff @@ -3,10 +3,10 @@ Index: fits/fits.sh --- fits.orig/fits.sh +++ fits/fits.sh @@ -16,6 +16,6 @@ done - + . "$(dirname $FITS_SCRIPT)/fits-env.sh" - + -cmd="java -classpath \"$APPCLASSPATH\" edu.harvard.hul.ois.fits.Fits $args" +cmd="java -Dlog4j.configuration=file:\"$FITS_HOME\"/log4j.properties -classpath \"$APPCLASSPATH\" edu.harvard.hul.ois.fits.Fits $args" - + eval "exec $cmd" diff --git a/debs/jammy/fits/debian/patches/fits-ngserver-logging-and-maxmem.diff b/debs/jammy/fits/debian/patches/fits-ngserver-logging-and-maxmem.diff index 3157b1f6..c6353046 100644 --- a/debs/jammy/fits/debian/patches/fits-ngserver-logging-and-maxmem.diff +++ b/debs/jammy/fits/debian/patches/fits-ngserver-logging-and-maxmem.diff @@ -5,18 +5,17 @@ Index: fits/fits-ngserver.sh @@ -6,6 +6,8 @@ # The one required parameter is the path to nailgun's jar; it can also be # specified via the NAILGUN_JAR environment variable. - + +test -r /etc/default/fits && . /etc/default/fits + . "$(dirname $BASH_SOURCE)/fits-env.sh" - + if [[ ! $NAILGUN_JAR ]] && [[ ! $1 ]]; then @@ -17,7 +19,7 @@ NAILGUN_JAR=$1 fi - + -cmd="java -classpath \"$APPCLASSPATH:$NAILGUN_JAR\" com.martiansoftware.nailgun.NGServer" +cmd="java -Xms${MAX_JAVA_HEAP_SIZE} -Xmx${MAX_JAVA_HEAP_SIZE} -XX:MaxMetaspaceSize=\"${MAX_JAVA_HEAP_SIZE}\" -Dlog4j.configuration=file:\"$FITS_HOME\"/log4j.properties -classpath \"$APPCLASSPATH:$NAILGUN_JAR\" com.martiansoftware.nailgun.NGServer" - + echo "You may now run FITS by typing: ng edu.harvard.hul.ois.fits.Fits [options]" >&2 - diff --git a/debs/jammy/jhove/Makefile b/debs/jammy/jhove/Makefile index 86af0beb..5ab83f57 100644 --- a/debs/jammy/jhove/Makefile +++ b/debs/jammy/jhove/Makefile @@ -47,7 +47,7 @@ deb-build: deb-clean dpkg-deb --build /debbuild/$(NAME)_$(VERSION)-$(RELEASE) @echo "==> Copying built files." mkdir -p $(DOCKER_VOLUME)/build/ - cp $(DEB_TOPDIR)/*.deb $(DOCKER_VOLUME)/build/ + cp $(DEB_TOPDIR)/*.deb $(DOCKER_VOLUME)/build/ deb-clean: @echo "==> Cleaning up previous RPMs builds." diff --git a/debs/jammy/temporal-ui/debian/rules b/debs/jammy/temporal-ui/debian/rules index f5136131..73477bac 100755 --- a/debs/jammy/temporal-ui/debian/rules +++ b/debs/jammy/temporal-ui/debian/rules @@ -16,7 +16,7 @@ override_dh_auto_install: mv -v temporal-ui.conf.yml temporal.yml # Rename temporal-ui.conf.yml mv -v ui-server temporal-ui # Rename temporal-ui binary dh_install temporal-ui /usr/bin/ # Copy the binary in /usr/bin - dh_install temporal.yml /etc/temporal-ui/config/ + dh_install temporal.yml /etc/temporal-ui/config/ # dh_install temporal-ui.service /etc/systemd/system/ override_dh_installsystemd: diff --git a/debs/siegfried/files/golang.pm b/debs/siegfried/files/golang.pm index 1e3ca828..fab587f1 100644 --- a/debs/siegfried/files/golang.pm +++ b/debs/siegfried/files/golang.pm @@ -2,7 +2,7 @@ package Debian::Debhelper::Buildsystem::golang; use strict; use base 'Debian::Debhelper::Buildsystem'; -use Debian::Debhelper::Dh_Lib; +use Debian::Debhelper::Dh_Lib; use Dpkg::Control::Info; use File::Copy; # in core since 5.002 use File::Path qw(make_path); # in core since 5.001 diff --git a/packer/scripts/common/minimize.sh b/packer/scripts/common/minimize.sh index 31ed9c59..b6c5fd2e 100644 --- a/packer/scripts/common/minimize.sh +++ b/packer/scripts/common/minimize.sh @@ -3,10 +3,10 @@ case "$PACKER_BUILDER_TYPE" in qemu) exit 0 ;; esac -# Stop eleasticsearch in case it is up to avoid to set the indices in read-only mode +# Stop eleasticsearch in case it is up to avoid to set the indices in read-only mode # Because the whiteout tasks are going to use the complete disk if (systemctl -q is-active elasticsearch.service); then - service elasticsearch stop + service elasticsearch stop fi # Whiteout root diff --git a/rpms/EL8/cadence-web/Dockerfile b/rpms/EL8/cadence-web/Dockerfile index bbe19b7a..6e7d8f19 100644 --- a/rpms/EL8/cadence-web/Dockerfile +++ b/rpms/EL8/cadence-web/Dockerfile @@ -6,5 +6,5 @@ FROM rockylinux:8 RUN yum -y install rpm-build make git wget gcc-c++ RUN curl -fsSL https://rpm.nodesource.com/setup_14.x | bash - -RUN dnf -y install nodejs +RUN dnf -y install nodejs ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/rh/rh-nodejs8/root/bin/ diff --git a/rpms/EL8/external-packages/external-packages.sh b/rpms/EL8/external-packages/external-packages.sh index 35ac9a29..34cc30b3 100644 --- a/rpms/EL8/external-packages/external-packages.sh +++ b/rpms/EL8/external-packages/external-packages.sh @@ -5,7 +5,7 @@ # RPM fusion repo -wget https://download1.rpmfusion.org/free/el/updates/8/x86_64/f/ffmpeg-4.2.9-1.el8.x86_64.rpm +wget https://download1.rpmfusion.org/free/el/updates/8/x86_64/f/ffmpeg-4.2.9-1.el8.x86_64.rpm wget https://download1.rpmfusion.org/free/el/updates/8/x86_64/f/ffmpeg-libs-4.2.9-1.el8.x86_64.rpm wget https://download1.rpmfusion.org/free/el/updates/8/x86_64/o/opencore-amr-0.1.5-7.el8.x86_64.rpm wget https://download1.rpmfusion.org/free/el/updates/8/x86_64/x/xvidcore-1.3.7-1.el8.x86_64.rpm diff --git a/rpms/EL8/fits/files/fits-enable-toolOutput.patch b/rpms/EL8/fits/files/fits-enable-toolOutput.patch index 0de3b3d3..7d36fdba 100644 --- a/rpms/EL8/fits/files/fits-enable-toolOutput.patch +++ b/rpms/EL8/fits/files/fits-enable-toolOutput.patch @@ -1,11 +1,11 @@ --- xml/fits.xml 2017-05-19 10:09:16.841578439 +0000 +++ xml/fits.xml.orig 2017-05-19 10:09:04.573563642 +0000 @@ -20,7 +20,7 @@ - + - false + true - true + true false xml/fits_output.xsd diff --git a/rpms/EL8/fits/files/fits-home.patch b/rpms/EL8/fits/files/fits-home.patch index 3d4add50..2a5692aa 100644 --- a/rpms/EL8/fits/files/fits-home.patch +++ b/rpms/EL8/fits/files/fits-home.patch @@ -3,8 +3,8 @@ @@ -17,7 +17,7 @@ fi done - + -FITS_HOME=`dirname $FITS_ENV_SCRIPT` +FITS_HOME="/usr/share/fits" - + export FITS_HOME diff --git a/rpms/EL8/fits/files/fits-logging.patch b/rpms/EL8/fits/files/fits-logging.patch index 2d8d003b..e8a8ceb6 100644 --- a/rpms/EL8/fits/files/fits-logging.patch +++ b/rpms/EL8/fits/files/fits-logging.patch @@ -1,10 +1,10 @@ --- fits.sh-orig 2018-10-23 20:12:30.142012129 +0200 +++ fits.sh 2018-10-23 20:16:50.971424713 +0200 @@ -16,6 +16,6 @@ - + . "$(dirname $FITS_SCRIPT)/fits-env.sh" - + -cmd="java -classpath \"$APPCLASSPATH\" edu.harvard.hul.ois.fits.Fits $args" +cmd="java -Dlog4j.configuration=file:\"$FITS_HOME\"/log4j.properties -classpath \"$APPCLASSPATH\" edu.harvard.hul.ois.fits.Fits $args" - + eval "exec $cmd" diff --git a/rpms/EL8/nailgun/Dockerfile b/rpms/EL8/nailgun/Dockerfile index 754da47b..dece0c36 100644 --- a/rpms/EL8/nailgun/Dockerfile +++ b/rpms/EL8/nailgun/Dockerfile @@ -4,7 +4,7 @@ FROM rockylinux:8 ENV GRADLE_VERSION 2.12 # Environment variables needed during runtime -ENV GRADLE_HOME /opt/gradle/latest +ENV GRADLE_HOME /opt/gradle/latest ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$GRADLE_HOME/bin diff --git a/rpms/EL8/nailgun/files/change-client-name.patch b/rpms/EL8/nailgun/files/change-client-name.patch index 332708a0..62056238 100644 --- a/rpms/EL8/nailgun/files/change-client-name.patch +++ b/rpms/EL8/nailgun/files/change-client-name.patch @@ -2,12 +2,12 @@ +++ nailgun-client/ng.c 2018-10-29 22:01:09.827125688 +0100 @@ -81,7 +81,7 @@ #define NAILGUN_CLIENT_NAME_EXE "ng.exe" - + #define NAILGUN_PORT_DEFAULT "2113" -#define NAILGUN_CLIENT_NAME "ng" +#define NAILGUN_CLIENT_NAME "ng-nailgun" #define CHUNK_HEADER_LEN (5) - + #define NAILGUN_SOCKET_FAILED (231) @@ -622,9 +622,9 @@ */ diff --git a/rpms/EL8/nailgun/files/makefile-change-client-name.patch b/rpms/EL8/nailgun/files/makefile-change-client-name.patch index 77c17df3..e10eb502 100644 --- a/rpms/EL8/nailgun/files/makefile-change-client-name.patch +++ b/rpms/EL8/nailgun/files/makefile-change-client-name.patch @@ -1,12 +1,12 @@ --- Makefile-orig 2018-10-29 21:57:47.231529852 +0100 +++ Makefile 2018-10-29 21:55:56.081451026 +0100 @@ -13,7 +13,7 @@ - + ng: ${SRCDIR}/ng.c @echo "Building ng client. To build a Windows binary, type 'make ng.exe'" - ${CC} $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o ng ${SRCDIR}/ng.c + ${CC} $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o ng-nailgun ${SRCDIR}/ng.c - + install: ng install -d ${PREFIX}/bin @@ -30,5 +30,5 @@ diff --git a/rpms/EL9/archivematica-storage-service/package.spec b/rpms/EL9/archivematica-storage-service/package.spec index 1f5f9cbc..a9b6d106 100644 --- a/rpms/EL9/archivematica-storage-service/package.spec +++ b/rpms/EL9/archivematica-storage-service/package.spec @@ -63,7 +63,7 @@ virtualenv /usr/share/archivematica/virtualenvs/archivematica-storage-service cp -rf /usr/share/archivematica/virtualenvs/archivematica-storage-service/* %{buildroot}/usr/share/archivematica/virtualenvs/archivematica-storage-service/ cp -rf %{_sourcedir}/%{name}/storage_service/* %{buildroot}/usr/lib/archivematica/storage-service/ -cp %{_sourcedir}/%{name}/install/storage-service.gunicorn-config.py %{buildroot}/etc/archivematica/storage-service.gunicorn-config.py +cp %{_sourcedir}/%{name}/install/storage-service.gunicorn-config.py %{buildroot}/etc/archivematica/storage-service.gunicorn-config.py cp %{_sourcedir}/%{name}/install/storageService.logging.json %{buildroot}/etc/archivematica/storageService.logging.json cp %{_etcdir}/archivematica-storage-service.service %{buildroot}/usr/lib/systemd/system/archivematica-storage-service.service cp %{_etcdir}/archivematica-storage-service.env %{buildroot}/etc/sysconfig/archivematica-storage-service diff --git a/rpms/EL9/cadence-web/Dockerfile b/rpms/EL9/cadence-web/Dockerfile index 1fbf4435..8eefb94d 100644 --- a/rpms/EL9/cadence-web/Dockerfile +++ b/rpms/EL9/cadence-web/Dockerfile @@ -6,5 +6,5 @@ FROM rockylinux:9 RUN yum -y install rpm-build make git wget gcc-c++ RUN curl -fsSL https://rpm.nodesource.com/setup_14.x | bash - -RUN dnf -y install nodejs +RUN dnf -y install nodejs ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/rh/rh-nodejs8/root/bin/ diff --git a/rpms/EL9/fits/files/fits-enable-toolOutput.patch b/rpms/EL9/fits/files/fits-enable-toolOutput.patch index 0de3b3d3..7d36fdba 100644 --- a/rpms/EL9/fits/files/fits-enable-toolOutput.patch +++ b/rpms/EL9/fits/files/fits-enable-toolOutput.patch @@ -1,11 +1,11 @@ --- xml/fits.xml 2017-05-19 10:09:16.841578439 +0000 +++ xml/fits.xml.orig 2017-05-19 10:09:04.573563642 +0000 @@ -20,7 +20,7 @@ - + - false + true - true + true false xml/fits_output.xsd diff --git a/rpms/EL9/fits/files/fits-home.patch b/rpms/EL9/fits/files/fits-home.patch index 3d4add50..2a5692aa 100644 --- a/rpms/EL9/fits/files/fits-home.patch +++ b/rpms/EL9/fits/files/fits-home.patch @@ -3,8 +3,8 @@ @@ -17,7 +17,7 @@ fi done - + -FITS_HOME=`dirname $FITS_ENV_SCRIPT` +FITS_HOME="/usr/share/fits" - + export FITS_HOME diff --git a/rpms/EL9/fits/files/fits-logging.patch b/rpms/EL9/fits/files/fits-logging.patch index 2d8d003b..e8a8ceb6 100644 --- a/rpms/EL9/fits/files/fits-logging.patch +++ b/rpms/EL9/fits/files/fits-logging.patch @@ -1,10 +1,10 @@ --- fits.sh-orig 2018-10-23 20:12:30.142012129 +0200 +++ fits.sh 2018-10-23 20:16:50.971424713 +0200 @@ -16,6 +16,6 @@ - + . "$(dirname $FITS_SCRIPT)/fits-env.sh" - + -cmd="java -classpath \"$APPCLASSPATH\" edu.harvard.hul.ois.fits.Fits $args" +cmd="java -Dlog4j.configuration=file:\"$FITS_HOME\"/log4j.properties -classpath \"$APPCLASSPATH\" edu.harvard.hul.ois.fits.Fits $args" - + eval "exec $cmd" diff --git a/rpms/EL9/nailgun/Dockerfile b/rpms/EL9/nailgun/Dockerfile index 8d8fccc3..c2b0ee52 100644 --- a/rpms/EL9/nailgun/Dockerfile +++ b/rpms/EL9/nailgun/Dockerfile @@ -4,7 +4,7 @@ FROM rockylinux:9 ENV GRADLE_VERSION 2.12 # Environment variables needed during runtime -ENV GRADLE_HOME /opt/gradle/latest +ENV GRADLE_HOME /opt/gradle/latest ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$GRADLE_HOME/bin diff --git a/rpms/EL9/nailgun/files/change-client-name.patch b/rpms/EL9/nailgun/files/change-client-name.patch index 332708a0..62056238 100644 --- a/rpms/EL9/nailgun/files/change-client-name.patch +++ b/rpms/EL9/nailgun/files/change-client-name.patch @@ -2,12 +2,12 @@ +++ nailgun-client/ng.c 2018-10-29 22:01:09.827125688 +0100 @@ -81,7 +81,7 @@ #define NAILGUN_CLIENT_NAME_EXE "ng.exe" - + #define NAILGUN_PORT_DEFAULT "2113" -#define NAILGUN_CLIENT_NAME "ng" +#define NAILGUN_CLIENT_NAME "ng-nailgun" #define CHUNK_HEADER_LEN (5) - + #define NAILGUN_SOCKET_FAILED (231) @@ -622,9 +622,9 @@ */ diff --git a/rpms/EL9/nailgun/files/makefile-change-client-name.patch b/rpms/EL9/nailgun/files/makefile-change-client-name.patch index 77c17df3..e10eb502 100644 --- a/rpms/EL9/nailgun/files/makefile-change-client-name.patch +++ b/rpms/EL9/nailgun/files/makefile-change-client-name.patch @@ -1,12 +1,12 @@ --- Makefile-orig 2018-10-29 21:57:47.231529852 +0100 +++ Makefile 2018-10-29 21:55:56.081451026 +0100 @@ -13,7 +13,7 @@ - + ng: ${SRCDIR}/ng.c @echo "Building ng client. To build a Windows binary, type 'make ng.exe'" - ${CC} $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o ng ${SRCDIR}/ng.c + ${CC} $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o ng-nailgun ${SRCDIR}/ng.c - + install: ng install -d ${PREFIX}/bin @@ -30,5 +30,5 @@ diff --git a/tools/aptversion.py b/tools/aptversion.py index 322de01d..7c2d2c2c 100644 --- a/tools/aptversion.py +++ b/tools/aptversion.py @@ -10,4 +10,4 @@ elif vc == 0: print('version a == version b') elif vc < 0: - print('version a < version b') + print('version a < version b')