Grammar + misc fixes per PR review

* Remove unnecessary `apt-get update` commands
* Change `if ! (command); then exit 1; fi` to `command || exit 1` to avoid subshell
This commit is contained in:
William Wernert
2021-02-16 14:17:41 -05:00
parent 3323e900ef
commit 0bd5ddf6a6
3 changed files with 10 additions and 9 deletions

View File

@@ -1958,11 +1958,7 @@ saltify() {
} >> "$setup_log" 2>&1
yum versionlock salt*
else
if ! (DEBIAN_FRONTEND=noninteractive retry 50 10 "apt-get -y -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" upgrade" >> "$setup_log" 2>&1); then
exit 1
fi
retry 50 10 "apt-get update" >> "$setup_log" 2>&1 || exit 1
DEBIAN_FRONTEND=noninteractive retry 50 10 "apt-get -y -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" upgrade" >> "$setup_log" 2>&1 || exit 1
if [ $OSVER != "xenial" ]; then
# Switch to Python 3 as default if this is not xenial