From a7ca6117363a83988baa773f63863e172bc16df6 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 11 Feb 2021 22:12:47 +0100 Subject: [PATCH 1/3] Use better characters for text boxing in piuparts hook --- pbuilder-hookdir/C10shell | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pbuilder-hookdir/C10shell b/pbuilder-hookdir/C10shell index b9c3deb..5445cb7 100755 --- a/pbuilder-hookdir/C10shell +++ b/pbuilder-hookdir/C10shell @@ -59,7 +59,7 @@ cp -ax "$BUILD" "/var/cache/pbuilder/build/debug.$ID" cat < Date: Thu, 11 Feb 2021 22:28:29 +0100 Subject: [PATCH 2/3] Remove superfluous debian/tmp prefix from debhelper .install file By default dh_install already looks into debian/tmp, so there is no need to be explicit about this location. --- debian/jenkins-debian-glue.install | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/debian/jenkins-debian-glue.install b/debian/jenkins-debian-glue.install index 8ad1f90..b46f8cd 100644 --- a/debian/jenkins-debian-glue.install +++ b/debian/jenkins-debian-glue.install @@ -1,19 +1,19 @@ -debian/tmp/usr/bin/adtsummary_tap usr/bin/ -debian/tmp/usr/bin/build-and-provide-package usr/bin/ -debian/tmp/usr/bin/checkbashism_tap usr/bin/ -debian/tmp/usr/bin/generate-git-snapshot usr/bin/ -debian/tmp/usr/bin/generate-reprepro-codename usr/bin/ -debian/tmp/usr/bin/generate-svn-snapshot usr/bin/ -debian/tmp/usr/bin/increase-version-number usr/bin/ -debian/tmp/usr/bin/jdg-debc usr/bin/ -debian/tmp/usr/bin/lintian-junit-report usr/bin/ -debian/tmp/usr/bin/pep8_tap usr/bin/ -debian/tmp/usr/bin/perlcritic_tap usr/bin/ -debian/tmp/usr/bin/piuparts_tap usr/bin/ -debian/tmp/usr/bin/piuparts_wrapper usr/bin/ -debian/tmp/usr/bin/remove-reprepro-codename usr/bin/ -debian/tmp/usr/bin/repository_checker usr/bin/ -debian/tmp/usr/bin/shellcheck_tap usr/bin/ -debian/tmp/usr/bin/tap_tool_dispatcher usr/bin/ -debian/tmp/usr/share/jenkins-debian-glue/examples/debian_glue etc/jenkins/ -debian/tmp/usr/share/jenkins-debian-glue/pbuilder-hookdir/ usr/share/jenkins-debian-glue/ +usr/bin/adtsummary_tap usr/bin/ +usr/bin/build-and-provide-package usr/bin/ +usr/bin/checkbashism_tap usr/bin/ +usr/bin/generate-git-snapshot usr/bin/ +usr/bin/generate-reprepro-codename usr/bin/ +usr/bin/generate-svn-snapshot usr/bin/ +usr/bin/increase-version-number usr/bin/ +usr/bin/jdg-debc usr/bin/ +usr/bin/lintian-junit-report usr/bin/ +usr/bin/pep8_tap usr/bin/ +usr/bin/perlcritic_tap usr/bin/ +usr/bin/piuparts_tap usr/bin/ +usr/bin/piuparts_wrapper usr/bin/ +usr/bin/remove-reprepro-codename usr/bin/ +usr/bin/repository_checker usr/bin/ +usr/bin/shellcheck_tap usr/bin/ +usr/bin/tap_tool_dispatcher usr/bin/ +usr/share/jenkins-debian-glue/examples/debian_glue etc/jenkins/ +usr/share/jenkins-debian-glue/pbuilder-hookdir/ usr/share/jenkins-debian-glue/ From 886884cfc4e73b8107f512b618dfdd3aa1b6b7b7 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 11 Feb 2021 22:27:29 +0100 Subject: [PATCH 3/3] Namespace and rename programs to reduce the namespace pollution MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All programs are namespaced now with «jdg-» or «jdg-tap-» and their names had their ‘_’ replaced with ‘-’. For backwards compatibility symlinks are provided for a transition period to avoid breakage, but projects should be switched to the new names, which will disappear eventually. --- debian/NEWS | 11 +++++++ debian/jenkins-debian-glue.install | 32 +++++++++---------- debian/jenkins-debian-glue.links | 16 ++++++++++ debian/jenkins-debian-glue.lintian-overrides | 14 ++++---- jjb/jdg-freight.yaml | 8 ++--- jjb/jdg-reprepro.yaml | 14 ++++---- pbuilder-hookdir/B20autopkgtest | 2 +- puppet/jenkins_debian_glue.pp | 20 ++++++------ ...-package => jdg-build-and-provide-package} | 12 +++---- ...git-snapshot => jdg-generate-git-snapshot} | 2 +- ...odename => jdg-generate-reprepro-codename} | 2 +- ...svn-snapshot => jdg-generate-svn-snapshot} | 2 +- ...ion-number => jdg-increase-version-number} | 2 +- ...-junit-report => jdg-lintian-junit-report} | 0 ...{piuparts_wrapper => jdg-piuparts-wrapper} | 0 ...-codename => jdg-remove-reprepro-codename} | 0 ...ository_checker => jdg-repository-checker} | 2 +- tap/{adtsummary_tap => jdg-tap-adtsummary} | 0 ...{checkbashism_tap => jdg-tap-checkbashism} | 0 tap/{pep8_tap => jdg-tap-pep8} | 0 tap/{perlcritic_tap => jdg-tap-perlcritic} | 0 tap/{piuparts_tap => jdg-tap-piuparts} | 0 tap/{shellcheck_tap => jdg-tap-shellcheck} | 0 ...ool_dispatcher => jdg-tap-tool-dispatcher} | 10 +++--- tests/increase-version-number | 2 +- 25 files changed, 89 insertions(+), 62 deletions(-) create mode 100644 debian/jenkins-debian-glue.links rename scripts/{build-and-provide-package => jdg-build-and-provide-package} (98%) rename scripts/{generate-git-snapshot => jdg-generate-git-snapshot} (99%) rename scripts/{generate-reprepro-codename => jdg-generate-reprepro-codename} (98%) rename scripts/{generate-svn-snapshot => jdg-generate-svn-snapshot} (98%) rename scripts/{increase-version-number => jdg-increase-version-number} (95%) rename scripts/{lintian-junit-report => jdg-lintian-junit-report} (100%) rename scripts/{piuparts_wrapper => jdg-piuparts-wrapper} (100%) rename scripts/{remove-reprepro-codename => jdg-remove-reprepro-codename} (100%) rename scripts/{repository_checker => jdg-repository-checker} (99%) rename tap/{adtsummary_tap => jdg-tap-adtsummary} (100%) rename tap/{checkbashism_tap => jdg-tap-checkbashism} (100%) rename tap/{pep8_tap => jdg-tap-pep8} (100%) rename tap/{perlcritic_tap => jdg-tap-perlcritic} (100%) rename tap/{piuparts_tap => jdg-tap-piuparts} (100%) rename tap/{shellcheck_tap => jdg-tap-shellcheck} (100%) rename tap/{tap_tool_dispatcher => jdg-tap-tool-dispatcher} (87%) diff --git a/debian/NEWS b/debian/NEWS index 6ce4493..f60b74c 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,14 @@ +jenkins-debian-glue (0.22.0) UNRELEASED; urgency=medium + + To reduce the namespace pollution, all programs are namespaced now with + «jdg-» or «jdg-tap-» and their names had their ‘_’ replaced with ‘-’. + + For backwards compatibility symlinks are provided for a transition period + to avoid breakage, but projects should be switched to the new names, which + will disappear eventually. + + -- Guillem Jover Thu, 11 Feb 2021 22:24:37 +0100 + jenkins-debian-glue (0.14.0) unstable; urgency=medium To reduce the amount of Debian binary packages we decided to diff --git a/debian/jenkins-debian-glue.install b/debian/jenkins-debian-glue.install index b46f8cd..ace5081 100644 --- a/debian/jenkins-debian-glue.install +++ b/debian/jenkins-debian-glue.install @@ -1,19 +1,19 @@ -usr/bin/adtsummary_tap usr/bin/ -usr/bin/build-and-provide-package usr/bin/ -usr/bin/checkbashism_tap usr/bin/ -usr/bin/generate-git-snapshot usr/bin/ -usr/bin/generate-reprepro-codename usr/bin/ -usr/bin/generate-svn-snapshot usr/bin/ -usr/bin/increase-version-number usr/bin/ +usr/bin/jdg-build-and-provide-package usr/bin/ usr/bin/jdg-debc usr/bin/ -usr/bin/lintian-junit-report usr/bin/ -usr/bin/pep8_tap usr/bin/ -usr/bin/perlcritic_tap usr/bin/ -usr/bin/piuparts_tap usr/bin/ -usr/bin/piuparts_wrapper usr/bin/ -usr/bin/remove-reprepro-codename usr/bin/ -usr/bin/repository_checker usr/bin/ -usr/bin/shellcheck_tap usr/bin/ -usr/bin/tap_tool_dispatcher usr/bin/ +usr/bin/jdg-generate-git-snapshot usr/bin/ +usr/bin/jdg-generate-reprepro-codename usr/bin/ +usr/bin/jdg-generate-svn-snapshot usr/bin/ +usr/bin/jdg-increase-version-number usr/bin/ +usr/bin/jdg-lintian-junit-report usr/bin/ +usr/bin/jdg-piuparts-wrapper usr/bin/ +usr/bin/jdg-remove-reprepro-codename usr/bin/ +usr/bin/jdg-repository-checker usr/bin/ +usr/bin/jdg-tap-adtsummary usr/bin/ +usr/bin/jdg-tap-checkbashism usr/bin/ +usr/bin/jdg-tap-pep8 usr/bin/ +usr/bin/jdg-tap-perlcritic usr/bin/ +usr/bin/jdg-tap-piuparts usr/bin/ +usr/bin/jdg-tap-shellcheck usr/bin/ +usr/bin/jdg-tap-tool-dispatcher usr/bin/ usr/share/jenkins-debian-glue/examples/debian_glue etc/jenkins/ usr/share/jenkins-debian-glue/pbuilder-hookdir/ usr/share/jenkins-debian-glue/ diff --git a/debian/jenkins-debian-glue.links b/debian/jenkins-debian-glue.links new file mode 100644 index 0000000..f6f68b5 --- /dev/null +++ b/debian/jenkins-debian-glue.links @@ -0,0 +1,16 @@ +usr/bin/jdg-build-and-provide-package usr/bin/build-and-provide-package +usr/bin/jdg-generate-git-snapshot usr/bin/generate-git-snapshot +usr/bin/jdg-generate-reprepro-codename usr/bin/generate-reprepro-codename +usr/bin/jdg-generate-svn-snapshot usr/bin/generate-svn-snapshot +usr/bin/jdg-increase-version-number usr/bin/increase-version-number +usr/bin/jdg-lintian-junit-report usr/bin/lintian-junit-report +usr/bin/jdg-piuparts-wrapper usr/bin/piuparts_wrapper +usr/bin/jdg-remove-reprepro-codename usr/bin/remove-reprepro-codename +usr/bin/jdg-repository-checker usr/bin/repository_checker +usr/bin/jdg-tap-adtsummary usr/bin/adtsummary_tap +usr/bin/jdg-tap-checkbashism usr/bin/checkbashism_tap +usr/bin/jdg-tap-pep8 usr/bin/pep8_tap +usr/bin/jdg-tap-perlcritic usr/bin/perlcritic_tap +usr/bin/jdg-tap-piuparts usr/bin/piuparts_tap +usr/bin/jdg-tap-shellcheck usr/bin/shellcheck_tap +usr/bin/jdg-tap-tool-dispatcher usr/bin/tap_tool_dispatcher diff --git a/debian/jenkins-debian-glue.lintian-overrides b/debian/jenkins-debian-glue.lintian-overrides index 442ec66..d8e9823 100644 --- a/debian/jenkins-debian-glue.lintian-overrides +++ b/debian/jenkins-debian-glue.lintian-overrides @@ -1,7 +1,7 @@ -jenkins-debian-glue: ruby-script-but-no-ruby-dep usr/bin/adtsummary_tap #!ruby -jenkins-debian-glue: ruby-script-but-no-ruby-dep usr/bin/checkbashism_tap #!ruby -jenkins-debian-glue: ruby-script-but-no-ruby-dep usr/bin/lintian-junit-report #!ruby -jenkins-debian-glue: ruby-script-but-no-ruby-dep usr/bin/pep8_tap #!ruby -jenkins-debian-glue: ruby-script-but-no-ruby-dep usr/bin/perlcritic_tap #!ruby -jenkins-debian-glue: ruby-script-but-no-ruby-dep usr/bin/piuparts_tap #!ruby -jenkins-debian-glue: ruby-script-but-no-ruby-dep usr/bin/shellcheck_tap #!ruby +jenkins-debian-glue: ruby-script-but-no-ruby-dep usr/bin/jdg-lintian-junit-report #!ruby +jenkins-debian-glue: ruby-script-but-no-ruby-dep usr/bin/jdg-tap-adtsummary #!ruby +jenkins-debian-glue: ruby-script-but-no-ruby-dep usr/bin/jdg-tap-checkbashism #!ruby +jenkins-debian-glue: ruby-script-but-no-ruby-dep usr/bin/jdg-tap-pep8 #!ruby +jenkins-debian-glue: ruby-script-but-no-ruby-dep usr/bin/jdg-tap-perlcritic #!ruby +jenkins-debian-glue: ruby-script-but-no-ruby-dep usr/bin/jdg-tap-piuparts #!ruby +jenkins-debian-glue: ruby-script-but-no-ruby-dep usr/bin/jdg-tap-shellcheck #!ruby diff --git a/jjb/jdg-freight.yaml b/jjb/jdg-freight.yaml index ad477cf..643607f 100644 --- a/jjb/jdg-freight.yaml +++ b/jjb/jdg-freight.yaml @@ -26,10 +26,10 @@ wipe-workspace: false builders: - shell: 'rm -f ./* || true' - - shell: '/usr/bin/generate-git-snapshot' + - shell: '/usr/bin/jdg-generate-git-snapshot' - shell: | mkdir -p report - /usr/bin/lintian-junit-report *.dsc > report/lintian.xml + /usr/bin/jdg-lintian-junit-report *.dsc > report/lintian.xml publishers: - archive: artifacts: '*.gz,*.bz2,*.xz,*.deb,*.dsc,*.git,*.changes,*.buildinfo,lintian.txt' @@ -77,10 +77,10 @@ export USE_FREIGHT=true export SUDO_CMD=sudo export KEY_ID=DEADBEEF # please adjust, or edit /etc/freight.conf - /usr/bin/build-and-provide-package + /usr/bin/jdg-build-and-provide-package - shell: | mkdir -p report - /usr/bin/lintian-junit-report *.changes > report/lintian.xml + /usr/bin/jdg-lintian-junit-report *.changes > report/lintian.xml publishers: - archive: artifacts: '*.gz,*.bz2,*.xz,*.deb,*.dsc,*.git,*.changes,*.buildinfo,lintian.txt' diff --git a/jjb/jdg-reprepro.yaml b/jjb/jdg-reprepro.yaml index e3aa858..1e02bd8 100644 --- a/jjb/jdg-reprepro.yaml +++ b/jjb/jdg-reprepro.yaml @@ -27,10 +27,10 @@ wipe-workspace: false builders: - shell: 'rm -f ./* || true' - - shell: '/usr/bin/generate-git-snapshot' + - shell: '/usr/bin/jdg-generate-git-snapshot' - shell: | mkdir -p report - /usr/bin/lintian-junit-report *.dsc > report/lintian.xml + /usr/bin/jdg-lintian-junit-report *.dsc > report/lintian.xml publishers: - archive: artifacts: '*.gz,*.bz2,*.xz,*.deb,*.dsc,*.git,*.changes,*.buildinfo,lintian.txt' @@ -74,13 +74,13 @@ filter: '*' which-build: upstream-build fallback-to-last-successful: true - - shell: "/usr/bin/build-and-provide-package" + - shell: "/usr/bin/jdg-build-and-provide-package" - shell: | echo "Listing packages inside the {name} repository:" - /usr/bin/repository_checker --list-repos {name} + /usr/bin/jdg-repository-checker --list-repos {name} - shell: | mkdir -p report - /usr/bin/lintian-junit-report *.changes > report/lintian.xml + /usr/bin/jdg-lintian-junit-report *.changes > report/lintian.xml publishers: - archive: artifacts: '*.gz,*.bz2,*.xz,*.deb,*.dsc,*.git,*.changes,*.buildinfo,lintian.txt' @@ -116,8 +116,8 @@ target: 'artifacts/' - shell: | # sadly piuparts always returns with exit code 1 :(( - sudo piuparts_wrapper $PWD/artifacts/*.deb || true - - shell: 'piuparts_tap piuparts.txt > piuparts.tap' + sudo jdg-piuparts-wrapper $PWD/artifacts/*.deb || true + - shell: 'jdg-tap-piuparts piuparts.txt > piuparts.tap' publishers: - tap: results: 'piuparts.tap' diff --git a/pbuilder-hookdir/B20autopkgtest b/pbuilder-hookdir/B20autopkgtest index 96b9d36..7eccaab 100755 --- a/pbuilder-hookdir/B20autopkgtest +++ b/pbuilder-hookdir/B20autopkgtest @@ -89,7 +89,7 @@ fi tar acf /tmp/buildd/autopkgtest.tar.gz /tmp/buildd/autopkgtest.out case ${EXIT:-0} in - 2|4|6|8) # let adtsummary_tap report the failure + 2|4|6|8) # let jdg-tap-adtsummary report the failure exit 0 ;; *) diff --git a/puppet/jenkins_debian_glue.pp b/puppet/jenkins_debian_glue.pp index 7cb8e5c..1f7f82f 100644 --- a/puppet/jenkins_debian_glue.pp +++ b/puppet/jenkins_debian_glue.pp @@ -317,13 +317,13 @@ class jenkins::software { content => '## Deployed via jenkins_debian_glue.pp # Make sure DEB_* options reach cowbuilder, like e.g.: -# export DEB_BUILD_OPTIONS="parallel=8" /usr/bin/build-and-provide-package +# export DEB_BUILD_OPTIONS="parallel=8" /usr/bin/jdg-build-and-provide-package Defaults env_keep+="DEB_* DIST ARCH ADT MIRRORSITE" # for *-binaries job jenkins ALL=NOPASSWD: /usr/sbin/cowbuilder, /usr/sbin/chroot # for *-piuparts job -jenkins ALL=NOPASSWD: /usr/sbin/piuparts, /usr/sbin/debootstrap, /usr/bin/piuparts_wrapper +jenkins ALL=NOPASSWD: /usr/sbin/piuparts, /usr/sbin/debootstrap, /usr/bin/jdg-piuparts-wrapper ', require => Package['sudo'], } @@ -426,14 +426,14 @@ class jenkins::config { # when using git: -/usr/bin/generate-git-snapshot +/usr/bin/jdg-generate-git-snapshot # when using subversion: -# /usr/bin/generate-svn-snapshot +# /usr/bin/jdg-generate-svn-snapshot mkdir -p report -/usr/bin/lintian-junit-report *.dsc > report/lintian.xml +/usr/bin/jdg-lintian-junit-report *.dsc > report/lintian.xml @@ -525,15 +525,15 @@ class jenkins::config { export POST_BUILD_HOOK=/usr/bin/jdg-debc -/usr/bin/build-and-provide-package +/usr/bin/jdg-build-and-provide-package echo "Listing packages inside the jenkins-debian-glue repository:" -/usr/bin/repository_checker --list-repos jenkins-debian-glue +/usr/bin/jdg-repository_checker --list-repos jenkins-debian-glue mkdir -p report -/usr/bin/lintian-junit-report *.dsc > report/lintian.xml +/usr/bin/jdg-lintian-junit-report *.dsc > report/lintian.xml @@ -619,10 +619,10 @@ class jenkins::config { # sadly piuparts always returns with exit code 1 :(( -sudo piuparts_wrapper \${PWD}/artifacts/*.deb || true +sudo jdg-piuparts-wrapper \${PWD}/artifacts/*.deb || true - piuparts_tap piuparts.txt > piuparts.tap + jdg-tap-piuparts piuparts.txt > piuparts.tap diff --git a/scripts/build-and-provide-package b/scripts/jdg-build-and-provide-package similarity index 98% rename from scripts/build-and-provide-package rename to scripts/jdg-build-and-provide-package index 10aef52..0da9745 100755 --- a/scripts/build-and-provide-package +++ b/scripts/jdg-build-and-provide-package @@ -236,7 +236,7 @@ build_info() { identify_sourcefile() { if [ -n "${sources:-}" ] ; then echo "*** WARNING: sources variable [$sources] is set, please use BASE_PATH variable instead ***" - echo "*** If \$sources is unrelated to build-and-provide-package you can ignore this warning ***" + echo "*** If \$sources is unrelated to jdg-build-and-provide-package you can ignore this warning ***" fi echo "*** Identifying newest package version ***" @@ -938,10 +938,10 @@ reprepro_wrapper() { if ! [ -r "${REPOSITORY}"/conf/distributions ] ; then echo "*** reprepro configuration file ${REPOSITORY}/conf/distributions does not exist, generating now ***" - ${SUDO_CMD:-} generate-reprepro-codename "${REPOS}" + ${SUDO_CMD:-} jdg-generate-reprepro-codename "${REPOS}" elif ! ${SUDO_CMD:-} grep -q "^\(Codename\|Suite\): ${REPOS}$" "${REPOSITORY}"/conf/distributions ; then echo "*** Codename ${REPOS} does not exist in repository ${REPOSITORY}, generating now ***" - ${SUDO_CMD:-} generate-reprepro-codename "${REPOS}" + ${SUDO_CMD:-} jdg-generate-reprepro-codename "${REPOS}" fi remove_packages @@ -1026,7 +1026,7 @@ trunk_release() { else echo "*** TRUNK_RELEASE is enabled ($TRUNK_RELEASE) ***" - ${SUDO_CMD:-} generate-reprepro-codename "$TRUNK_RELEASE" + ${SUDO_CMD:-} jdg-generate-reprepro-codename "$TRUNK_RELEASE" if [ -n "${SKIP_REPREPRO_WRAPPER:-}" ] ; then @@ -1100,9 +1100,9 @@ release_repos() { cp "${WORKSPACE}/binaries/"* "${REPOSITORY}/incoming/${RELEASE_DISTRIBUTION}/" [ $? -eq 0 ] || bailout 1 "Error: Failed to copy binary packages to release directory." - REPOSITORY=$REPOSITORY generate-reprepro-codename "${RELEASE_DISTRIBUTION}" + REPOSITORY=$REPOSITORY jdg-generate-reprepro-codename "${RELEASE_DISTRIBUTION}" - # lock access to file to avoid duplicate entries when two build-and-provide-package + # lock access to file to avoid duplicate entries when two jdg-build-and-provide-package # runs happen at the very same time with regard to conf/incoming setup ( flock --timeout 5 9 || bailout 1 "Error: could not lock file ${REPOSITORY}/conf/incoming, giving up." diff --git a/scripts/generate-git-snapshot b/scripts/jdg-generate-git-snapshot similarity index 99% rename from scripts/generate-git-snapshot rename to scripts/jdg-generate-git-snapshot index 3c2e1b2..ccd265b 100755 --- a/scripts/generate-git-snapshot +++ b/scripts/jdg-generate-git-snapshot @@ -84,7 +84,7 @@ version_information() { # we want to get a version string like # $ORIG_VERSION+0~$TIMESTAMP.$BUILD_NUMBER~1.$GIT_ID # so the version is always increasing over time, no matter what - INCREASED_VERSION=$(increase-version-number $ORIG_VERSION) + INCREASED_VERSION=$(jdg-increase-version-number $ORIG_VERSION) if [ -n "${TIMESTAMP_FORMAT:-}" ] ; then echo "*** Using custom timestamp format as specified by TIMESTAMP_FORMAT ***" TIMESTAMP="$(date -u +"$TIMESTAMP_FORMAT")" diff --git a/scripts/generate-reprepro-codename b/scripts/jdg-generate-reprepro-codename similarity index 98% rename from scripts/generate-reprepro-codename rename to scripts/jdg-generate-reprepro-codename index 1ac3579..c5cd8cf 100755 --- a/scripts/generate-reprepro-codename +++ b/scripts/jdg-generate-reprepro-codename @@ -138,7 +138,7 @@ if [ -z "${KEY_ID:-}" ] ; then echo "*** and then adjust /etc/jenkins/debian_glue." fi -# lock access to file to avoid duplicate entries when two generate-reprepro-codename +# lock access to file to avoid duplicate entries when two jdg-generate-reprepro-codename # runs happen at the very same time ( flock --timeout 5 9 || bailout 1 "Error: could not lock file ${REPOSITORY}/conf/distributions, giving up." diff --git a/scripts/generate-svn-snapshot b/scripts/jdg-generate-svn-snapshot similarity index 98% rename from scripts/generate-svn-snapshot rename to scripts/jdg-generate-svn-snapshot index 0af61df..6bbafea 100755 --- a/scripts/generate-svn-snapshot +++ b/scripts/jdg-generate-svn-snapshot @@ -107,7 +107,7 @@ build_snapshot() { SNAPSHOT_VERSION="${PREVIOUS_VERSION}~${TIMESTAMP}.svn${SVN_REVISION}.${BUILD_NUMBER}" else # calculate new snapshot version - SNAPSHOT_VERSION="$(increase-version-number "$PREVIOUS_VERSION")~${TIMESTAMP}.svn${SVN_REVISION}.${BUILD_NUMBER}" + SNAPSHOT_VERSION="$(jdg-increase-version-number "$PREVIOUS_VERSION")~${TIMESTAMP}.svn${SVN_REVISION}.${BUILD_NUMBER}" fi # generate changelog diff --git a/scripts/increase-version-number b/scripts/jdg-increase-version-number similarity index 95% rename from scripts/increase-version-number rename to scripts/jdg-increase-version-number index d7f4a41..0ef9298 100755 --- a/scripts/increase-version-number +++ b/scripts/jdg-increase-version-number @@ -16,7 +16,7 @@ fi # where $existing_old_version is the provided , # $snapshot_version is a version number based on the output of # the script (as used inside scripts like -# generate-{git,svn}-snapshot) and $new_version is a version +# jdg-generate-{git,svn}-snapshot) and $new_version is a version # number that might show up in the future. # # NOTE: The author of jenkins-debian-glue is aware of only one diff --git a/scripts/lintian-junit-report b/scripts/jdg-lintian-junit-report similarity index 100% rename from scripts/lintian-junit-report rename to scripts/jdg-lintian-junit-report diff --git a/scripts/piuparts_wrapper b/scripts/jdg-piuparts-wrapper similarity index 100% rename from scripts/piuparts_wrapper rename to scripts/jdg-piuparts-wrapper diff --git a/scripts/remove-reprepro-codename b/scripts/jdg-remove-reprepro-codename similarity index 100% rename from scripts/remove-reprepro-codename rename to scripts/jdg-remove-reprepro-codename diff --git a/scripts/repository_checker b/scripts/jdg-repository-checker similarity index 99% rename from scripts/repository_checker rename to scripts/jdg-repository-checker index fdd1faf..94db89d 100755 --- a/scripts/repository_checker +++ b/scripts/jdg-repository-checker @@ -180,7 +180,7 @@ trap bailout SIGHUP SIGINT SIGQUIT SIGABRT SIGALRM SIGTERM # command line handling CMDLINE_OPTS=list-package:,list-binary-package:,list-binary-repos:,list-repos:,list-source-package:,list-source-repos:,repository:,,help,validate-incoming,validate-source-bin-versions,version,version-remove-epoch,validate-skip-package: -_opt_temp=$(getopt --name repository_checker -o +vhV --long $CMDLINE_OPTS -- "$@") +_opt_temp=$(getopt --name jdg-repository-checker -o +vhV --long $CMDLINE_OPTS -- "$@") if [ $? -ne 0 ]; then echo "Try '$0 --help' for more information." >& 2 exit 1 diff --git a/tap/adtsummary_tap b/tap/jdg-tap-adtsummary similarity index 100% rename from tap/adtsummary_tap rename to tap/jdg-tap-adtsummary diff --git a/tap/checkbashism_tap b/tap/jdg-tap-checkbashism similarity index 100% rename from tap/checkbashism_tap rename to tap/jdg-tap-checkbashism diff --git a/tap/pep8_tap b/tap/jdg-tap-pep8 similarity index 100% rename from tap/pep8_tap rename to tap/jdg-tap-pep8 diff --git a/tap/perlcritic_tap b/tap/jdg-tap-perlcritic similarity index 100% rename from tap/perlcritic_tap rename to tap/jdg-tap-perlcritic diff --git a/tap/piuparts_tap b/tap/jdg-tap-piuparts similarity index 100% rename from tap/piuparts_tap rename to tap/jdg-tap-piuparts diff --git a/tap/shellcheck_tap b/tap/jdg-tap-shellcheck similarity index 100% rename from tap/shellcheck_tap rename to tap/jdg-tap-shellcheck diff --git a/tap/tap_tool_dispatcher b/tap/jdg-tap-tool-dispatcher similarity index 87% rename from tap/tap_tool_dispatcher rename to tap/jdg-tap-tool-dispatcher index 7f7ae24..6011a91 100755 --- a/tap/tap_tool_dispatcher +++ b/tap/jdg-tap-tool-dispatcher @@ -8,7 +8,7 @@ BASE_BIN=${BASE_BIN:-/usr/bin} CMDLINE_OPTS=disable-checkbashism,disable-pep8,disable-perlcritic,disable-shellcheck CMDLINE_OPTS+=,file-list,help -_opt_temp=$(getopt --name tap_tool_dispatcher -o -f+h --long $CMDLINE_OPTS -- "$@") +_opt_temp=$(getopt --name jdg-tap-tool-dispatcher -o -f+h --long $CMDLINE_OPTS -- "$@") if [ $? -ne 0 ]; then echo "Try '$0 --help' for more information." >& 2 exit 1 @@ -110,7 +110,7 @@ if ! [ -x "$(which checkbashisms)" ] ; then echo "*** Skipping checkbashism checks as tool checkbashisms isn't present ***" else if $_opt_checkbashism ; then - echo "${BASE_BIN}/checkbashism_tap '{}' '>' ${REPORTS_DIRECTORY}'/{}_checkbashism.tap' ';' \\" >> "${TMPFILE}" + echo "${BASE_BIN}/jdg-tap-checkbashism '{}' '>' ${REPORTS_DIRECTORY}'/{}_checkbashism.tap' ';' \\" >> "${TMPFILE}" else echo "*** Skipping checkbashism tests as requested via --disable-checkbashism ***" fi @@ -120,7 +120,7 @@ if ! [ -x "$(which pep8)" ] ; then echo "*** Skipping pep8 checks as tool pep8 isn't present ***" else if $_opt_pep8 ; then - echo "${BASE_BIN}/pep8_tap '{}' '>' ${REPORTS_DIRECTORY}'/{}_pep8.tap' ';' \\" >> "${TMPFILE}" + echo "${BASE_BIN}/jdg-tap-pep8 '{}' '>' ${REPORTS_DIRECTORY}'/{}_pep8.tap' ';' \\" >> "${TMPFILE}" else echo "*** Skipping pep8 tests as requested via --disable-pep8 ***" fi @@ -130,7 +130,7 @@ if ! [ -x "$(which perlcritic)" ] ; then echo "*** Skipping perlcritic checks as tool perlcritic (package libperl-critic-perl) isn't present ***" else if $_opt_perlcritic ; then - echo "${BASE_BIN}/perlcritic_tap '{}' '>' ${REPORTS_DIRECTORY}'/{}_perlcritic.tap' ';' \\" >> "${TMPFILE}" + echo "${BASE_BIN}/jdg-tap-perlcritic '{}' '>' ${REPORTS_DIRECTORY}'/{}_perlcritic.tap' ';' \\" >> "${TMPFILE}" else echo "*** Skipping perlcritic tests as requested via --disable-perlcritic ***" fi @@ -140,7 +140,7 @@ if ! [ -x "$(which shellcheck)" ] ; then echo "*** Skipping shellcheck checks as tool shellcheck isn't present ***" else if $_opt_shellcheck ; then - echo "${BASE_BIN}/shellcheck_tap '{}' '>' ${REPORTS_DIRECTORY}'/{}_shellcheck.tap' ';'" >> "${TMPFILE}" + echo "${BASE_BIN}/jdg-tap-shellcheck '{}' '>' ${REPORTS_DIRECTORY}'/{}_shellcheck.tap' ';'" >> "${TMPFILE}" else echo "*** Skipping shellcheck tests as requested via --disable-shellcheck ***" fi diff --git a/tests/increase-version-number b/tests/increase-version-number index 4ba71fb..092a5b9 100755 --- a/tests/increase-version-number +++ b/tests/increase-version-number @@ -1,6 +1,6 @@ #!/bin/sh -SCRIPT=./scripts/increase-version-number +SCRIPT=./scripts/jdg-increase-version-number testEquality() {