diff options
| author | Philipp Wagner <mail@philipp-wagner.com> | 2023-12-06 04:02:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-06 04:02:58 +0300 |
| commit | def3a41f576ceffebdff8266b41b8589a2512ac2 (patch) | |
| tree | e059134cf4b98b639c0e0b3b34dc3977c2d05752 | |
| parent | d53b9d1816bac7a62f9ba5f20723eef428042d1f (diff) | |
Fix common-utils installation on RHEL (and friends) (#772)feature_dotnet_2.0.2
* Fix indentation in common-utils/main.sh
* common-utils: Fix install error on RHEL
On RHEL (and derivatives) the installation of the common-utils feature
could fail if the feature ran before (i.e., `PACKAGES_ALREADY_INSTALLED`
is set) and if either `INSTALL_ZSH` is false, or zsh was installed
earlier and `ZSH_ALREADY_INSTALLED` is true.
In these cases the script the `package_list` is empty, and `dnf`
terminates with the following error message:
```
usage: dnf install [-c [config file]] [-q] [-v] [--version]
[--installroot [path]] [--nodocs] [--noplugins]
[--enableplugin [plugin]] [--disableplugin [plugin]]
[--releasever RELEASEVER] [--setopt SETOPTS]
[--skip-broken] [-h] [--allowerasing] [-b | --nobest] [-C]
[-R [minutes]] [-d [debug level]] [--debugsolver]
[--showduplicates] [-e ERRORLEVEL] [--obsoletes]
[--rpmverbosity [debug level name]] [-y] [--assumeno]
[--enablerepo [repo]] [--disablerepo [repo] | --repo
[repo]] [--enable | --disable] [-x [package]]
[--disableexcludes [repo]] [--repofrompath [repo,path]]
[--noautoremove] [--nogpgcheck] [--color COLOR] [--refresh]
[-4] [-6] [--destdir DESTDIR] [--downloadonly]
[--comment COMMENT] [--bugfix] [--enhancement]
[--newpackage] [--security] [--advisory ADVISORY]
[--bz BUGZILLA] [--cve CVES]
[--sec-severity {Critical,Important,Moderate,Low}]
[--forcearch ARCH]
PACKAGE [PACKAGE ...]
dnf install: error: the following arguments are required: PACKAGE
```
Fix the problem by running `dnf` only with a non-zero `package_list`.
| -rw-r--r-- | src/common-utils/main.sh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh index d1a977f..a291f98 100644 --- a/src/common-utils/main.sh +++ b/src/common-utils/main.sh @@ -189,11 +189,11 @@ install_redhat_packages() { man-db \ strace" - # rockylinux:9 installs 'curl-minimal' which clashes with 'curl' - # Install 'curl' for every OS except this rockylinux:9 - if [[ "${ID}" = "rocky" ]] && [[ "${VERSION}" != *"9."* ]]; then - package_list="${package_list} curl" - fi + # rockylinux:9 installs 'curl-minimal' which clashes with 'curl' + # Install 'curl' for every OS except this rockylinux:9 + if [[ "${ID}" = "rocky" ]] && [[ "${VERSION}" != *"9."* ]]; then + package_list="${package_list} curl" + fi # Install OpenSSL 1.0 compat if needed if ${install_cmd} -q list compat-openssl10 >/dev/null 2>&1; then @@ -222,7 +222,9 @@ install_redhat_packages() { package_list="${package_list} zsh" fi - ${install_cmd} -y install ${package_list} + if [ -n "${package_list}" ]; then + ${install_cmd} -y install ${package_list} + fi # Get to latest versions of all packages if [ "${UPGRADE_PACKAGES}" = "true" ]; then |