Commit 0ef8bdd7 authored by Hugo Lefeuvre's avatar Hugo Lefeuvre Committed by Adrien Béraud

packaging: Use "repository" instead of "PPA"

PPA is a Ubuntu-specific term, but we also support Debian and
non-Ubuntu based distros. Use "repository" instead.

Change-Id: I646f6986d230e0abed53e7ce561fe2c5b4e37753
parent c4069bff
...@@ -15,18 +15,18 @@ set -e ...@@ -15,18 +15,18 @@ set -e
# [1] Configuration # # [1] Configuration #
############################################################################### ###############################################################################
# All PPA/package repo urls are expected to start with this string, regardless # All package repo urls are expected to start with this string, regardless
# of the distribution or version. The end tag is automatically appended, # of the distribution or version. The end tag is automatically appended,
# depending on the system the postinst script is run on. Examples: # depending on the system the postinst script is run on. Examples:
# #
# Ubuntu 18.04: # Ubuntu 18.04:
# $RING_PPA = $RING_PPA_BASE/ubuntu_18.04/ # $RING_REPO = $RING_REPO_BASE/ubuntu_18.04/
# #
# Debian 9: # Debian 9:
# $RING_PPA = $RING_PPA_BASE/debian_9 # $RING_REPO = $RING_REPO_BASE/debian_9
# #
# To update the appended end tags, modify the switch in [2]. # To update the appended end tags, modify the switch in [2].
RING_PPA_BASE="https://dl.ring.cx/ring-nightly" RING_REPO_BASE="https://dl.ring.cx/ring-nightly"
# Ring release key. # Ring release key.
RING_KEY_FINGERPRINT="A295D773307D25A33AE72F2F64CD5FA175348F84" RING_KEY_FINGERPRINT="A295D773307D25A33AE72F2F64CD5FA175348F84"
...@@ -94,7 +94,7 @@ CAN_ADD_DEB_SOURCE=true ...@@ -94,7 +94,7 @@ CAN_ADD_DEB_SOURCE=true
if [ -f /etc/os-release ]; then if [ -f /etc/os-release ]; then
. /etc/os-release . /etc/os-release
# Set-up Ring PPA end tag # Set-up Ring repository end tag
if [ "$ID" = "debian" ] && [ "$VER" = "9" ]; then if [ "$ID" = "debian" ] && [ "$VER" = "9" ]; then
ENDTAG="${ID}_${VERSION_ID}" ENDTAG="${ID}_${VERSION_ID}"
elif [ "$ID" = "ubuntu" ] && [ "$VER" = "16.04" ]; then elif [ "$ID" = "ubuntu" ] && [ "$VER" = "16.04" ]; then
...@@ -130,7 +130,7 @@ case "$1" in ...@@ -130,7 +130,7 @@ case "$1" in
fi fi
if [ "$CAN_ADD_DEB_SOURCE" = "true" ]; then if [ "$CAN_ADD_DEB_SOURCE" = "true" ]; then
RING_PPA="${RING_PPA_BASE}/${ENDTAG}" RING_REPO="${RING_REPO_BASE}/${ENDTAG}"
# We first add the key to the trusted keyring. # We first add the key to the trusted keyring.
apt-key add - > /dev/null 2>&1 << EOF apt-key add - > /dev/null 2>&1 << EOF
...@@ -144,7 +144,7 @@ EOF ...@@ -144,7 +144,7 @@ EOF
# as part of regular system upgrades # as part of regular system upgrades
Types: deb Types: deb
URIs: $RING_PPA URIs: $RING_REPO
Suites: ring Suites: ring
Architectures: i386 amd64 Architectures: i386 amd64
Components: main Components: main
...@@ -170,7 +170,7 @@ EOF ...@@ -170,7 +170,7 @@ EOF
# Added by Ring to prevent disabling of Ring repository sources on # Added by Ring to prevent disabling of Ring repository sources on
# distribution release upgrade. # distribution release upgrade.
[ThirdPartyMirrors] [ThirdPartyMirrors]
ring/${RING_UPDATE_MANAGER_ID}=${RING_PPA} ring/${RING_UPDATE_MANAGER_ID}=${RING_REPO}
EOF EOF
fi fi
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment