From d6d13b59cb602284efdf5d8bac527272e9e9b688 Mon Sep 17 00:00:00 2001 From: Dmitry Maksyoma Date: Fri, 25 Mar 2022 23:59:47 +1300 Subject: [PATCH] Refactor: extract bump-package-version-deb(1) --- builder/bump-package-version | 14 +------------- builder/bump-package-version-deb | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 13 deletions(-) create mode 100755 builder/bump-package-version-deb diff --git a/builder/bump-package-version b/builder/bump-package-version index 18012cf..ff4fd29 100755 --- a/builder/bump-package-version +++ b/builder/bump-package-version @@ -7,24 +7,12 @@ update_version_to_meet_packaging_standards() { sed -e 's/\([0-9]\)-\([a-zA-Z]\)/\1~\2/') } -add_debian_revision_to_new_version() { - echo "$new_version-1" -} - bump_rpm() { builder/bump-package-version-rpm "$new_version" } bump_deb() { - local image="debbump_package_version:dev" - local L_UID=$(id -u) - local L_GID=$(id -g) - local debian_version=$(add_debian_revision_to_new_version) - - docker build -t "$image" -f builder/dockerfile.bump-package-version . - docker run --rm -v "$PWD":/src --user "$L_UID:$L_GID" \ - "$image" /bin/bash -c \ - "cd /src && builder/bump-package-version-inside-docker-deb $debian_version" + builder/bump-package-version-deb "$new_version" } new_version="$1" diff --git a/builder/bump-package-version-deb b/builder/bump-package-version-deb new file mode 100755 index 0000000..65b417f --- /dev/null +++ b/builder/bump-package-version-deb @@ -0,0 +1,23 @@ +#!/bin/bash + +set -eo pipefail + +new_version="$1" + +add_debian_revision_to_new_version() { + echo "$new_version-1" +} + +bump_deb() { + local image="debbump_package_version:dev" + local L_UID=$(id -u) + local L_GID=$(id -g) + local debian_version=$(add_debian_revision_to_new_version) + + docker build -t "$image" -f builder/dockerfile.bump-package-version . + docker run --rm -v "$PWD":/src --user "$L_UID:$L_GID" \ + "$image" /bin/bash -c \ + "cd /src && builder/bump-package-version-inside-docker-deb $debian_version" +} + +bump_deb