modules
/
nutools
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Intégration de la branche ptools

This commit is contained in:
Jephté Clain 2015-04-12 13:30:14 +04:00
parent 10a7d4e57c 6258a6ba76
commit f321f1c011
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
prel
View File

@ -204,12 +204,13 @@ if [ "$action" == update ]; then
menu) menu)
setx majorv=pver -s "$oldver" -ux "${pver_opts[@]}" setx majorv=pver -s "$oldver" -ux "${pver_opts[@]}"
setx minorv=pver -s "$oldver" -uz "${pver_opts[@]}" setx minorv=pver -s "$oldver" -uz "${pver_opts[@]}"
setx patchlevelv=pver -g "$oldver" -up "${pver_opts[@]}" setx patchlevelv=pver -s "$oldver" -up "${pver_opts[@]}"
release="release-$minorv" release="release-$minorv"
branches=("release-$majorv" "release-$minorv" "release-$patchlevelv" master) branches=("release-$majorv" "release-$minorv" "release-$patchlevelv" master)
simple_menu release branches \ simple_menu release branches \
-t "Basculer vers une nouvelle branche de release" \ -t "Basculer vers une nouvelle branche de release" \
-m "Veuillez choisir la branche à créer" -m "Veuillez choisir la branche à créer"
[ "$release" != master ] && newver="${release#release-}"
;; ;;
major) major)
setx newver=pver -s "$oldver" -ux "${pver_opts[@]}" setx newver=pver -s "$oldver" -ux "${pver_opts[@]}"
@ -291,7 +292,10 @@ Vous allez créer la nouvelle branche de release ${COULEUR_VERTE}$release${COULE
pver -uv "$newver" && commitmsg="Init changelog & version $newver" pver -uv "$newver" && commitmsg="Init changelog & version $newver"
fi fi
changelog="## Version $release du $(date +%d/%m/%Y-%H:%M)" version="$newver"
[ -n "$version" ] || version="$release"
changelog="## Version $version du $(date +%d/%m/%Y-%H:%M)"
setx mergebase=git merge-base master "$release" setx mergebase=git merge-base master "$release"
setxp modifs=git log --oneline "$mergebase..$release" // grep -v "Intégration de la branche release-" setxp modifs=git log --oneline "$mergebase..$release" // grep -v "Intégration de la branche release-"
[ -n "$modifs" ] && changelog="$changelog [ -n "$modifs" ] && changelog="$changelog