rocky-linux/rocky-tools
4
0
Fork 0
mirror of https://github.com/rocky-linux/rocky-tools.git synced 2024-06-02 19:00:16 +00:00
Code Issues Projects Releases Activity

Fix shellcheck issues

Browse Source
This commit is contained in:
Peter Ajamian 2022-02-01 23:48:32 +13:00
parent 1f020ac079
commit e06c02cd51
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
migrate2rocky/migrate2rocky.sh
View File

@ -448,7 +448,7 @@ repoinfo () {
repoinfo_results=() repoinfo_results=()
for k in "${!repoinfo_results_cache[@]}"; do for k in "${!repoinfo_results_cache[@]}"; do
local repo=${k%%:*} key=${k#*:} local repo=${k%%:*} key=${k#*:}
if [[ $repo != $1 ]]; then if [[ $repo != "$1" ]]; then
continue continue
fi fi
@ -601,7 +601,7 @@ collect_system_info () {
dist_id=$(os-release ID) dist_id=$(os-release ID)
# We need a different dist ID for CentOS Linux vs CentOS Stream # We need a different dist ID for CentOS Linux vs CentOS Stream
if [[ $dist_id == centos ]] && rpm --quiet -q centos-stream-release; then if [[ $dist_id == centos ]] && rpm --quiet -q centos-stream-release; then
$dist_id+=-stream dist_id+=-stream
fi fi
PRETTY_NAME=$(os-release PRETTY_NAME) PRETTY_NAME=$(os-release PRETTY_NAME)
@ -643,7 +643,7 @@ collect_system_info () {
# repos # repos
for k in "${!dist_repourl_map[@]}"; do for k in "${!dist_repourl_map[@]}"; do
local d=${k%%:*} r=${k#*:} local d=${k%%:*} r=${k#*:}
if [[ $d != $dist_id || ! ${enabled_repo_check[$r]} ]] || if [[ $d != "$dist_id" || ! ${enabled_repo_check[$r]} ]] ||
check_repourl "$r"; then check_repourl "$r"; then
continue continue
fi fi
@ -969,7 +969,7 @@ package_swaps() {
# Use dnf shell to swap the system packages out. # Use dnf shell to swap the system packages out.
safednf -y shell --disablerepo=\* --noautoremove \ safednf -y shell --disablerepo=\* --noautoremove \
${dist_repourl_swaps[@]} \ "${dist_repourl_swaps[@]}" \
--setopt=protected_packages= --setopt=keepcache=True \ --setopt=protected_packages= --setopt=keepcache=True \
"${dnfparameters[@]}" \ "${dnfparameters[@]}" \
<<EOF <<EOF