use lsb_release to select repository

This commit is contained in:
Thomas Bernard 2019-07-24 03:47:04 +02:00
parent c20e408a82
commit 867ad86dd1
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
2 changed files with 8 additions and 8 deletions

View File

@ -67,7 +67,7 @@ job_win32:
job_atari: job_atari:
stage: build stage: build
before_script: before_script:
- apt-get update -qq && apt-get install -y -qq zip dos2unix - apt-get update -qq && apt-get install -y -qq zip dos2unix lsb-release
- "sh ./.install-cross-mint.sh" - "sh ./.install-cross-mint.sh"
script: script:
- "ATARICROSS=1 make 3rdparty -j2 || exit 1" - "ATARICROSS=1 make 3rdparty -j2 || exit 1"

View File

@ -49,15 +49,15 @@ EOF
if echo "$DISTRIB" | grep Ubuntu ; then if echo "$DISTRIB" | grep Ubuntu ; then
$SUDO add-apt-repository -y ppa:vriviere/ppa $SUDO add-apt-repository -y ppa:vriviere/ppa
else else
# assume Debian/Stretch (9.x) CODENAME=$(lsb_release -c -s)
if [ -z "$SUDO" ] ; then if [ -z "$SUDO" ] ; then
echo "deb http://vincent.riviere.free.fr/apt/ stretch contrib" >> /etc/apt/sources.list echo "deb http://vincent.riviere.free.fr/apt/ ${CODENAME} contrib" >> /etc/apt/sources.list
echo "deb-src http://vincent.riviere.free.fr/apt/ stretch contrib" >> /etc/apt/sources.list echo "deb-src http://vincent.riviere.free.fr/apt/ ${CODENAME} contrib" >> /etc/apt/sources.list
else else
echo "deb http://vincent.riviere.free.fr/apt/ stretch contrib" | $SUDO tee -a /etc/apt/sources.list echo "deb http://vincent.riviere.free.fr/apt/ ${CODENAME} contrib" | $SUDO tee -a /etc/apt/sources.list
echo "deb-src http://vincent.riviere.free.fr/apt/ stretch contrib" | $SUDO tee -a /etc/apt/sources.list echo "deb-src http://vincent.riviere.free.fr/apt/ ${CODENAME} contrib" | $SUDO tee -a /etc/apt/sources.list
fi fi
fi fi
$SUDO apt-get update -ym $SUDO apt-get update -ym || exit 1
$SUDO apt-get install -ym cross-mint-essential $SUDO apt-get install -ym cross-mint-essential || exit 1