paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-31 03:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

installer: Remove code specific to stretch or xenial.

Browse Source 
Support for Xenial and Stretch was removed (5154ddafca, 0f4b1076ad,
8944e0ad53, 79acd5ae40, 1219a2e854), but not all codepaths were
updated to remove their conditionals on it.

Remove all code predicated on Xenial or Stretch.  debathena support
was migrated to Bionic, since that appears to be the current state of
existing debathena servers.
This commit is contained in:
Alex Vandiver
2020-06-24 00:30:27 +00:00
committed by Tim Abbott
parent e4899eae8b
commit 876ee4a8ed
8 changed files with 4 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/lib/setup-apt-repo
View File

@@ -36,7 +36,7 @@ apt-get -y install "${pre_setup_deps[@]}"
SCRIPTS_PATH="$(dirname "$(dirname "$0")")"
release=$(lsb_release -sc)
if [[ "$release" =~ ^(xenial|bionic|cosmic|disco|eoan|focal)$ ]] ; then
if [[ "$release" =~ ^(bionic|cosmic|disco|eoan|focal)$ ]] ; then
apt-key add "$SCRIPTS_PATH"/setup/pgdg.asc
apt-key add "$SCRIPTS_PATH"/setup/pgroonga-ppa.asc
cat >$SOURCES_FILE <<EOF
@@ -46,7 +46,7 @@ deb-src http://apt.postgresql.org/pub/repos/apt/ $release-pgdg main
deb http://ppa.launchpad.net/groonga/ppa/ubuntu $release main
deb-src http://ppa.launchpad.net/groonga/ppa/ubuntu $release main
EOF
elif [[ "$release" =~ ^(stretch|buster)$ ]] ; then
elif [[ "$release" =~ ^(buster)$ ]] ; then
apt-key add "$SCRIPTS_PATH"/setup/pgdg.asc
apt-key add "$SCRIPTS_PATH"/setup/pgroonga-debian.asc
cat >$SOURCES_FILE <<EOF
@@ -71,8 +71,4 @@ else
apt-get update && rm -f "$STAMP_FILE"
fi
if [ "$release" = "stretch" ]; then
apt-get install -y groonga-keyring
fi
echo "$DEPENDENCIES_HASH" > "$DEPENDENCIES_HASH_FILE"