Bump version numbers and sync to template.
This commit is contained in:
parent
736488f9ea
commit
75d3b429b0
2 changed files with 12 additions and 10 deletions
|
@ -1,5 +1,5 @@
|
|||
#!/bin/bash
|
||||
# Version: 0.6.5
|
||||
# Version: 0.6.6
|
||||
# Copyright (c) 2005-2022:
|
||||
# Darren 'Tadgy' Austin <darren (at) afterdark.org.uk>
|
||||
# Licensed under the terms of the GNU General Public License version 3.
|
||||
|
@ -48,6 +48,9 @@ cd "$(cd "${BASH_SOURCE[0]%/*}"; pwd -P)"
|
|||
# shellcheck disable=SC2016
|
||||
[[ -z "$PKG_STORE" ]] && PKG_STORE='/tmp/pkg-store/$DIST_OS_ID-$DIST_OS_VERSION_ID'
|
||||
|
||||
# Package configuration archive path.
|
||||
[[ -z "$PKG_CONFIG_ARCHIVE" ]] && PKG_CONFIG_ARCHIVE="/tmp/pkg-config-archive"
|
||||
|
||||
# Parse command line options.
|
||||
while (( $# > 0 )); do
|
||||
if [[ "$1" =~ ^-(-)?f(orce)?$ ]]; then
|
||||
|
@ -93,7 +96,6 @@ unset DIST_OS_VERSION_CODENAME
|
|||
# Build environment.
|
||||
BUILD_WORKDIR="${BUILD_WORKDIR:-/tmp/pkg-build}"
|
||||
BUILD_ROOT="$BUILD_WORKDIR/pkg-$PKG_NAME"
|
||||
BUILD_CONFIG_ARCHIVE="${BUILD_CONFIG_ARCHIVE:-/tmp/pkg-config-archive}"
|
||||
BUILD_PREFIX="${BUILD_PREFIX:-/opt}"
|
||||
BUILD_ALTCC="${BUILD_ALTCC:-}"
|
||||
BUILD_ALTCXX="${BUILD_ALTCXX:-}"
|
||||
|
@ -144,9 +146,8 @@ case "${BUILD_ARCH:=$(uname -m)}" in
|
|||
;;
|
||||
esac
|
||||
|
||||
|
||||
# Now all possible changes to variables in PKG_STORE are complete, expand out the embedded variables.
|
||||
eval "$(declare -p PKG_STORE | sed -re 's/\\\$/$/g')"
|
||||
# Now all possible changes to variables in PKG_STORE and PKG_CONFIG_ARCHIVE are complete, expand out the embedded variables.
|
||||
eval "$(declare -p PKG_STORE PKG_CONFIG_ARCHIVE | sed -re 's/\\\$/$/g')"
|
||||
|
||||
# Sanity.
|
||||
SRC_DIR="$(pwd)"
|
||||
|
@ -247,10 +248,11 @@ done
|
|||
# Move the package configuration files into the archive.
|
||||
[[ -e "$BUILD_ROOT/etc/$PKG_NAME" ]] && {
|
||||
(( ${BUILD_KEEPCONFIGS:-0} == 0 )) && {
|
||||
rm -rf "$BUILD_CONFIG_ARCHIVE/$PKG_NAME-$PKG_VERSION"
|
||||
mkdir -p -m 755 "$BUILD_CONFIG_ARCHIVE/$PKG_NAME-$PKG_VERSION/etc/$PKG_NAME" || \
|
||||
die "Failed to create directory: $BUILD_CONFIG_ARCHIVE/$PKG_NAME-$PKG_VERSION/etc/$PKG_NAME"
|
||||
mv "$BUILD_ROOT/etc/$PKG_NAME"/* "$BUILD_CONFIG_ARCHIVE/$PKG_NAME-$PKG_VERSION/etc/$PKG_NAME" || die "Failed to move configuration files to archive"
|
||||
rm -rf "$PKG_CONFIG_ARCHIVE/$PKG_NAME-${PKG_VERSION//-/_}-$PKG_ARCH-$PKG_BUILD${PKG_TAG//-/_}"
|
||||
mkdir -p -m 755 "$PKG_CONFIG_ARCHIVE/$PKG_NAME-${PKG_VERSION//-/_}-$PKG_ARCH-$PKG_BUILD${PKG_TAG//-/_}/etc/$PKG_NAME" || \
|
||||
die "Failed to create directory: $PKG_CONFIG_ARCHIVE/$PKG_NAME-${PKG_VERSION//-/_}-$PKG_ARCH-$PKG_BUILD${PKG_TAG//-/_}/etc/$PKG_NAME"
|
||||
mv "$BUILD_ROOT/etc/$PKG_NAME"/* "$PKG_CONFIG_ARCHIVE/$PKG_NAME-${PKG_VERSION//-/_}-$PKG_ARCH-$PKG_BUILD${PKG_TAG//-/_}/etc/$PKG_NAME" || \
|
||||
die "Failed to move configuration files to archive"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue