YunoHost/vinaigrette
1
0
Fork 0
mirror of https://github.com/YunoHost/vinaigrette.git synced 2024-09-03 20:06:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Misc fixes é_è

Browse source
This commit is contained in:
Alexandre Aubin 2018-05-03 03:21:34 +02:00
parent 436bae2b94
commit 572be2d7c2
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/build_deb
View file

@ -33,7 +33,7 @@ EOF
function main() function main()
{ {
validate_argument validate_arguments
retrieve_package_info retrieve_package_info
build_sources build_sources
add_to_reprepro add_to_reprepro
@ -87,6 +87,7 @@ function retrieve_package_info()
function build_sources() function build_sources()
{ {
echo "---------------------------------------------------"
echo "Building source package of ${PACKAGE}_${VERSION}..." echo "Building source package of ${PACKAGE}_${VERSION}..."
echo "---------------------------------------------------" echo "---------------------------------------------------"
@ -100,6 +101,7 @@ function build_sources()
function add_to_reprepro() function add_to_reprepro()
{ {
echo "---------------------------------------------------"
echo "Adding ${PACKAGE}_${VERSION} to ${DISTRIB}/${BRANCH}..." echo "Adding ${PACKAGE}_${VERSION} to ${DISTRIB}/${BRANCH}..."
echo "---------------------------------------------------" echo "---------------------------------------------------"
$INCLUDE_CHANGES $DISTRIB $BRANCH $CHANGES_FILE $INCLUDE_CHANGES $DISTRIB $BRANCH $CHANGES_FILE

5
ynh-build
View file

@ -5,7 +5,7 @@ readonly PROJECT=$1
readonly BRANCH=$2 readonly BRANCH=$2
readonly DISTRIB=$3 readonly DISTRIB=$3
readonly VERSION=$4 readonly VERSION=$4
readonly TAG="debian/$VERSION" readonly TAG=$(echo "debian/$VERSION" | tr '~' '-')
source /home/vinaigrette/config/config source /home/vinaigrette/config/config
@ -76,8 +76,7 @@ function checkout_tag()
git fetch --quiet git fetch --quiet
git fetch --tags --quiet git fetch --tags --quiet
git checkout $DISTRIB-$BRANCH --quiet git checkout $DISTRIB-$BRANCH --quiet
#git checkout $BRANCH --quiet git reset --hard origin/$DISTRIB-$BRANCH --quiet
#git pull origin $BRANCH --quiet
LASTVERSIONCHANGELOG=$(dpkg-parsechangelog -S Version 2>/dev/null) LASTVERSIONCHANGELOG=$(dpkg-parsechangelog -S Version 2>/dev/null)