Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #291 from keepassxreboot/meta/releasetool-osx

Browse Source 
Fix release-tool for OS X
This commit is contained in:
Janek Bevendorff 2017-02-11 18:55:18 +01:00 committed by GitHub
commit 589f76afca
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
release-tool
View File

@ -16,8 +16,8 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
echo -e "\e[1m\e[32mKeePassXC\e[0m Release Preparation Helper" printf "\e[1m\e[32mKeePassXC\e[0m Release Preparation Helper\n"
echo -e "Copyright (C) 2017 KeePassXC Team <https://keepassxc.org/>\n" printf "Copyright (C) 2017 KeePassXC Team <https://keepassxc.org/>\n\n"
# ----------------------------------------------------------------------- # -----------------------------------------------------------------------
@ -57,7 +57,7 @@ printUsage() {
cmd="COMMAND" cmd="COMMAND"
fi fi
echo -e "\e[1mUsage:\e[0m $(basename $0) $cmd [options]" printf "\e[1mUsage:\e[0m $(basename $0) $cmd [options]\n"
if [ "COMMAND" == "$cmd" ]; then if [ "COMMAND" == "$cmd" ]; then
cat << EOF cat << EOF
@ -126,11 +126,11 @@ EOF
} }
logInfo() { logInfo() {
echo -e "\e[1m[ \e[34mINFO\e[39m ]\e[0m $1" printf "\e[1m[ \e[34mINFO\e[39m ]\e[0m $1\n"
} }
logError() { logError() {
echo -e "\e[1m[ \e[31mERROR\e[39m ]\e[0m $1" >&2 printf "\e[1m[ \e[31mERROR\e[39m ]\e[0m $1\n" >&2
} }
init() { init() {
@ -246,7 +246,7 @@ checkTransifexCommandExists() {
# re-implement realpath for OS X (thanks mschrag) # re-implement realpath for OS X (thanks mschrag)
# https://superuser.com/questions/205127/ # https://superuser.com/questions/205127/
if $(command -v realpath > /dev/null); then if ! $(command -v realpath > /dev/null); then
realpath() { realpath() {
pushd . > /dev/null pushd . > /dev/null
if [ -d "$1" ]; then if [ -d "$1" ]; then
@ -348,14 +348,15 @@ merge() {
checkWorkingTreeClean checkWorkingTreeClean
checkSourceBranchExists checkSourceBranchExists
checkTargetBranchExists checkTargetBranchExists
logInfo "Checking out source branch '${SOURCE_BRANCH}'..."
git checkout "$SOURCE_BRANCH"
checkVersionInCMake checkVersionInCMake
checkChangeLog checkChangeLog
logInfo "All checks pass, getting our hands dirty now!" logInfo "All checks pass, getting our hands dirty now!"
logInfo "Checking out source branch..."
git checkout "$SOURCE_BRANCH"
logInfo "Updating language files..." logInfo "Updating language files..."
./share/translations/update.sh ./share/translations/update.sh
if [ 0 -ne $? ]; then if [ 0 -ne $? ]; then
@ -372,15 +373,15 @@ merge() {
fi fi
fi fi
CHANGELOG=$(grep -Pzo "(?<=${RELEASE_NAME} \(\d{4}-\d{2}-\d{2}\)\n)=+\n\n?(?:.|\n)+?\n(?=\n)" \
CHANGELOG | grep -Pzo '(?<=\n\n)(.|\n)+' | tr -d \\0)
COMMIT_MSG="Release ${RELEASE_NAME}"
logInfo "Checking out target branch '${TARGET_BRANCH}'..." logInfo "Checking out target branch '${TARGET_BRANCH}'..."
git checkout "$TARGET_BRANCH" git checkout "$TARGET_BRANCH"
logInfo "Merging '${SOURCE_BRANCH}' into '${TARGET_BRANCH}'..." logInfo "Merging '${SOURCE_BRANCH}' into '${TARGET_BRANCH}'..."
CHANGELOG=$(grep -Pzo "(?<=${RELEASE_NAME} \(\d{4}-\d{2}-\d{2}\)\n)=+\n\n?(?:.|\n)+?\n(?=\n)" \
CHANGELOG | grep -Pzo '(?<=\n\n)(.|\n)+' | tr -d \\0)
COMMIT_MSG="Release ${RELEASE_NAME}"
git merge "$SOURCE_BRANCH" --no-ff -m "$COMMIT_MSG" -m "${CHANGELOG}" "$SOURCE_BRANCH" -S"$GPG_GIT_KEY" git merge "$SOURCE_BRANCH" --no-ff -m "$COMMIT_MSG" -m "${CHANGELOG}" "$SOURCE_BRANCH" -S"$GPG_GIT_KEY"
logInfo "Creating tag '${TAG_NAME}'..." logInfo "Creating tag '${TAG_NAME}'..."