mirror of
https://github.com/rocky-linux/rocky-tools.git
synced 2024-11-22 13:11:26 +00:00
Merge pull request #36 from pajamian/main
Fix issue with oracle 8.4, shellcheck directives
This commit is contained in:
commit
e118e7a0fd
@ -63,6 +63,7 @@ logfile=/var/log/migrate2rocky.log
|
|||||||
# Output to 4 just goes to stderr.
|
# Output to 4 just goes to stderr.
|
||||||
# Output to 5 just goes to the logfile.
|
# Output to 5 just goes to the logfile.
|
||||||
truncate -s0 "$logfile"
|
truncate -s0 "$logfile"
|
||||||
|
# shellcheck disable=SC2094
|
||||||
exec \
|
exec \
|
||||||
3>&1 \
|
3>&1 \
|
||||||
4>&2 \
|
4>&2 \
|
||||||
@ -82,6 +83,7 @@ msg_format () {
|
|||||||
_var="$1"
|
_var="$1"
|
||||||
shift
|
shift
|
||||||
if (( $# > 1 )); then
|
if (( $# > 1 )); then
|
||||||
|
# shellcheck disable=SC2059
|
||||||
printf -v "$_var" "$@"
|
printf -v "$_var" "$@"
|
||||||
else
|
else
|
||||||
printf -v "$_var" "%s" "$1"
|
printf -v "$_var" "%s" "$1"
|
||||||
@ -277,6 +279,7 @@ repoinfo () {
|
|||||||
# it won't appear in a .repo file on a line by itself, so it's safe to
|
# it won't appear in a .repo file on a line by itself, so it's safe to
|
||||||
# search for the string to make the awk parser look all the way to the end
|
# search for the string to make the awk parser look all the way to the end
|
||||||
# of the file.
|
# of the file.
|
||||||
|
# shellcheck disable=SC2154
|
||||||
repoinfo_results[Repo-gpgkey]=$(
|
repoinfo_results[Repo-gpgkey]=$(
|
||||||
awk '
|
awk '
|
||||||
$0=="['"${repoinfo_results[Repo-id]}"']",$0=="end_of_file" {
|
$0=="['"${repoinfo_results[Repo-id]}"']",$0=="end_of_file" {
|
||||||
@ -290,6 +293,7 @@ repoinfo () {
|
|||||||
|
|
||||||
# Add an indicator of whether this is a subscription-manager managed
|
# Add an indicator of whether this is a subscription-manager managed
|
||||||
# repository.
|
# repository.
|
||||||
|
# shellcheck disable=SC2154
|
||||||
repoinfo_results[Repo-managed]=$(
|
repoinfo_results[Repo-managed]=$(
|
||||||
awk '
|
awk '
|
||||||
BEGIN {FS="[)(]"}
|
BEGIN {FS="[)(]"}
|
||||||
@ -432,6 +436,7 @@ collect_system_info () {
|
|||||||
[rocky-release]=system-release
|
[rocky-release]=system-release
|
||||||
)
|
)
|
||||||
addl_provide_removes=(
|
addl_provide_removes=(
|
||||||
|
redhat-release
|
||||||
redhat-release-eula
|
redhat-release-eula
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user