Skip to content
Snippets Groups Projects
Commit c4069bff authored by Hugo Lefeuvre's avatar Hugo Lefeuvre Committed by Sébastien Blin
Browse files

packaging: fix oci regression (s/$OS/$ID/)


f737fa7b introduced a major regression breaking ring-all's oci
feature: incorrect $OS variable was used instead of $ID.

Change-Id: Ice1866affa649cf7d3f560a9cb6d4a25ea5c1551
Reviewed-by: default avatarSebastien Blin <sebastien.blin@savoirfairelinux.com>
parent f737fa7b
Branches
Tags
No related merge requests found
...@@ -95,19 +95,19 @@ if [ -f /etc/os-release ]; then ...@@ -95,19 +95,19 @@ if [ -f /etc/os-release ]; then
. /etc/os-release . /etc/os-release
# Set-up Ring PPA end tag # Set-up Ring PPA end tag
if [ "$OS" = "debian" ] && [ "$VER" = "9" ]; then if [ "$ID" = "debian" ] && [ "$VER" = "9" ]; then
ENDTAG="${ID}_${VERSION_ID}" ENDTAG="${ID}_${VERSION_ID}"
elif [ "$OS" = "ubuntu" ] && [ "$VER" = "16.04" ]; then elif [ "$ID" = "ubuntu" ] && [ "$VER" = "16.04" ]; then
ENDTAG="${ID}_${VERSION_ID}" ENDTAG="${ID}_${VERSION_ID}"
elif [ "$OS" = "ubuntu" ] && [ "$VER" = "17.04" ]; then elif [ "$ID" = "ubuntu" ] && [ "$VER" = "17.04" ]; then
ENDTAG="${ID}_${VERSION_ID}" ENDTAG="${ID}_${VERSION_ID}"
elif [ "$OS" = "ubuntu" ] && [ "$VER" = "17.10" ]; then elif [ "$ID" = "ubuntu" ] && [ "$VER" = "17.10" ]; then
ENDTAG="${ID}_${VERSION_ID}" ENDTAG="${ID}_${VERSION_ID}"
elif [ "$OS" = "ubuntu" ] && [ "$VER" = "18.04" ]; then elif [ "$ID" = "ubuntu" ] && [ "$VER" = "18.04" ]; then
ENDTAG="${ID}_${VERSION_ID}" ENDTAG="${ID}_${VERSION_ID}"
elif [ "$OS" = "linuxmint" ] && [ "$UBUNTU_CODENAME" = "xenial" ]; then elif [ "$ID" = "linuxmint" ] && [ "$UBUNTU_CODENAME" = "xenial" ]; then
ENDTAG="ubuntu_16.04" ENDTAG="ubuntu_16.04"
elif [ "$OS" = "linuxmint" ] && [ "$UBUNTU_CODENAME" = "bionic" ]; then elif [ "$ID" = "linuxmint" ] && [ "$UBUNTU_CODENAME" = "bionic" ]; then
ENDTAG="ubuntu_18.04" ENDTAG="ubuntu_18.04"
else else
# Distribution is not supported. Don't provide automatic updates. # Distribution is not supported. Don't provide automatic updates.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment