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

Small tweaks to ease buster/bullseye cohabitation/transition

Browse source
This commit is contained in:
Alexandre Aubin 2022-01-19 23:22:30 +01:00
parent 1f5d5f0b64
commit 511725d29a
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daily-build
View file

@ -43,8 +43,8 @@ function build_if_needed()
local DISTRIB=$2 local DISTRIB=$2
local LAST_BUILD_FOR_THIS_PACKAGE=$LAST_BUILDS_CACHE/${DISTRIB}_${PACKAGE} local LAST_BUILD_FOR_THIS_PACKAGE=$LAST_BUILDS_CACHE/${DISTRIB}_${PACKAGE}
BRANCH_NIGHTLY="$DISTRIB" [[ $DISTRIB == "buster" ]] && BRANCH_NIGHTLY="buster"
[[ $DISTRIB == "buster" ]] && BRANCH_NIGHTLY="dev" [[ $DISTRIB == "bullseye" ]] && BRANCH_NIGHTLY="dev"
cd $GIT_REPOS/$PACKAGE cd $GIT_REPOS/$PACKAGE

12
ynh-build
View file

@ -3,10 +3,20 @@
readonly THISSCRIPT=$0 readonly THISSCRIPT=$0
readonly PROJECT=$1 readonly PROJECT=$1
readonly BRANCH=$2 readonly BRANCH=$2
readonly DISTRIB="buster"
readonly VERSION=$3 readonly VERSION=$3
readonly TAG=$(echo "debian/$VERSION" | tr '~' '-') readonly TAG=$(echo "debian/$VERSION" | tr '~' '-')
if [[ "$(echo $VERSION | awk -F'.' '{print $1}')" == "4" ]]
then
readonly DISTRIB="buster"
elif [[ "$(echo $VERSION | awk -F'.' '{print $1}')" == "11" ]]
then
readonly DISTRIB="bullseye"
else
readonly DISTRIB="fixyoversionnumberbruh"
fi
source /home/vinaigrette/config/config source /home/vinaigrette/config/config
source /home/vinaigrette/scripts/common.sh source /home/vinaigrette/scripts/common.sh