mirror of
https://github.com/zulip/zulip.git
synced 2025-10-24 16:43:57 +00:00
setup-apt-repo: Move supported release check earlier.
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
committed by
Tim Abbott
parent
c8bb98554e
commit
7077a289ae
@@ -54,6 +54,16 @@ fi
|
|||||||
|
|
||||||
release="$(. /etc/os-release && printf '%s' "$VERSION_CODENAME")"
|
release="$(. /etc/os-release && printf '%s' "$VERSION_CODENAME")"
|
||||||
|
|
||||||
|
if [ ! -f "$LIST_PATH/$release.list" ]; then
|
||||||
|
cat <<EOF
|
||||||
|
Unsupported release $release for sources.list file $LIST. To add a
|
||||||
|
new release, make a $LIST_PATH/$release.list file based on existing
|
||||||
|
.list files in that directory.
|
||||||
|
|
||||||
|
EOF
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
DEPENDENCIES_HASH=$(sha1sum "$LIST_PATH/"*.asc "$0")
|
DEPENDENCIES_HASH=$(sha1sum "$LIST_PATH/"*.asc "$0")
|
||||||
DEPENDENCIES_HASH_FILE="/var/lib/zulip/setup-repositories-state-$LIST"
|
DEPENDENCIES_HASH_FILE="/var/lib/zulip/setup-repositories-state-$LIST"
|
||||||
# Ensure that DEPENDENCIES_HASH_FILE exists before hashing it.
|
# Ensure that DEPENDENCIES_HASH_FILE exists before hashing it.
|
||||||
@@ -80,18 +90,8 @@ if ! apt-get -dy install "${pre_setup_deps[@]}"; then
|
|||||||
fi
|
fi
|
||||||
apt-get -y install "${pre_setup_deps[@]}"
|
apt-get -y install "${pre_setup_deps[@]}"
|
||||||
|
|
||||||
if [ -f "$LIST_PATH/$release.list" ]; then
|
apt-key add "$LIST_PATH/"*.asc
|
||||||
apt-key add "$LIST_PATH/"*.asc
|
cp "$LIST_PATH/$release.list" "$SOURCES_FILE"
|
||||||
cp "$LIST_PATH/$release.list" "$SOURCES_FILE"
|
|
||||||
else
|
|
||||||
cat <<EOF
|
|
||||||
Unsupported release $release for sources.list file $LIST. To add a
|
|
||||||
new release, make a $LIST_PATH/$release.list file based on existing
|
|
||||||
.list files in that directory.
|
|
||||||
|
|
||||||
EOF
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -e "$LIST_PATH/custom.sh" ]; then
|
if [ -e "$LIST_PATH/custom.sh" ]; then
|
||||||
export LIST_PATH
|
export LIST_PATH
|
||||||
|
|||||||
Reference in New Issue
Block a user