From 9da97de2cb49cc746bfa3f273fb557afc6bc3861 Mon Sep 17 00:00:00 2001 From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com> Date: Fri, 14 Feb 2025 20:56:58 -0500 Subject: [PATCH 1/8] fix compile for fedora, rocky, old fedoras --- core/tabs/system-setup/compile-setup.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/tabs/system-setup/compile-setup.sh b/core/tabs/system-setup/compile-setup.sh index 746d1d5f..14baf44f 100755 --- a/core/tabs/system-setup/compile-setup.sh +++ b/core/tabs/system-setup/compile-setup.sh @@ -25,12 +25,13 @@ installDepend() { "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" "$COMPILEDEPS" ;; dnf) - COMPILEDEPS='@development-tools' "$ESCALATION_TOOL" "$PACKAGER" update - "$ESCALATION_TOOL" "$PACKAGER" config-manager --set-enabled powertools - "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" "$COMPILEDEPS" - "$ESCALATION_TOOL" "$PACKAGER" install -y glibc-devel.i686 libgcc.i686 - ;; + "$ESCALATION_TOOL" "$PACKAGER" -y config-manager --set-enabled powertools 2>/dev/null || \ + "$ESCALATION_TOOL" "$PACKAGER" -y config-manager --set-enabled crb 2>/dev/null || true + "$ESCALATION_TOOL" "$PACKAGER" -y install $DEPENDENCIES + "$ESCALATION_TOOL" "$PACKAGER" -y group install Development\ Tools 2>/dev/null || \ + "$ESCALATION_TOOL" "$PACKAGER" -y group install development-tools + "$ESCALATION_TOOL" "$PACKAGER" -y install glibc-devel.i686 libgcc.i686 zypper) COMPILEDEPS='patterns-devel-base-devel_basis' "$ESCALATION_TOOL" "$PACKAGER" refresh From 4c1611fcd2b50b6e444a7f166add8e1f182b26bc Mon Sep 17 00:00:00 2001 From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com> Date: Fri, 14 Feb 2025 21:28:08 -0500 Subject: [PATCH 2/8] Update compile-setup.sh --- core/tabs/system-setup/compile-setup.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/core/tabs/system-setup/compile-setup.sh b/core/tabs/system-setup/compile-setup.sh index 14baf44f..a2662c51 100755 --- a/core/tabs/system-setup/compile-setup.sh +++ b/core/tabs/system-setup/compile-setup.sh @@ -26,12 +26,17 @@ installDepend() { ;; dnf) "$ESCALATION_TOOL" "$PACKAGER" update - "$ESCALATION_TOOL" "$PACKAGER" -y config-manager --set-enabled powertools 2>/dev/null || \ - "$ESCALATION_TOOL" "$PACKAGER" -y config-manager --set-enabled crb 2>/dev/null || true - "$ESCALATION_TOOL" "$PACKAGER" -y install $DEPENDENCIES - "$ESCALATION_TOOL" "$PACKAGER" -y group install Development\ Tools 2>/dev/null || \ - "$ESCALATION_TOOL" "$PACKAGER" -y group install development-tools + if ! "$ESCALATION_TOOL" "$PACKAGER" -y config-manager --set-enabled powertools; then + if ! "$ESCALATION_TOOL" "$PACKAGER" -y config-manager --set-enabled crb; then + : # Do nothing if both fail (equivalent to true) + fi + fi + "$ESCALATION_TOOL" "$PACKAGER" -y install "$DEPENDENCIES" + if ! "$ESCALATION_TOOL" "$PACKAGER" -y group install "Development Tools"; then + "$ESCALATION_TOOL" "$PACKAGER" -y group install development-tools + fi "$ESCALATION_TOOL" "$PACKAGER" -y install glibc-devel.i686 libgcc.i686 + ;; zypper) COMPILEDEPS='patterns-devel-base-devel_basis' "$ESCALATION_TOOL" "$PACKAGER" refresh From 130187f8fd8dec30674eb00ae7682cce807a142b Mon Sep 17 00:00:00 2001 From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com> Date: Fri, 14 Feb 2025 21:57:19 -0500 Subject: [PATCH 3/8] Update compile-setup.sh --- core/tabs/system-setup/compile-setup.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/core/tabs/system-setup/compile-setup.sh b/core/tabs/system-setup/compile-setup.sh index a2662c51..cbee4105 100755 --- a/core/tabs/system-setup/compile-setup.sh +++ b/core/tabs/system-setup/compile-setup.sh @@ -25,13 +25,15 @@ installDepend() { "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" "$COMPILEDEPS" ;; dnf) - "$ESCALATION_TOOL" "$PACKAGER" update - if ! "$ESCALATION_TOOL" "$PACKAGER" -y config-manager --set-enabled powertools; then - if ! "$ESCALATION_TOOL" "$PACKAGER" -y config-manager --set-enabled crb; then - : # Do nothing if both fail (equivalent to true) + "$ESCALATION_TOOL" "$PACKAGER" update -y + if ! "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable powertools; then + if ! "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable crb; then + : # Do nothing if both fail fi fi - "$ESCALATION_TOOL" "$PACKAGER" -y install "$DEPENDENCIES" + if ! "$ESCALATION_TOOL" "$PACKAGER" -y install $DEPENDENCIES; then + : # Continue if package install fails + fi if ! "$ESCALATION_TOOL" "$PACKAGER" -y group install "Development Tools"; then "$ESCALATION_TOOL" "$PACKAGER" -y group install development-tools fi From 034fb3bece470b6c892cffc7c27562b6f03d58c4 Mon Sep 17 00:00:00 2001 From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com> Date: Fri, 14 Feb 2025 22:25:53 -0500 Subject: [PATCH 4/8] Update compile-setup.sh --- core/tabs/system-setup/compile-setup.sh | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/core/tabs/system-setup/compile-setup.sh b/core/tabs/system-setup/compile-setup.sh index cbee4105..b0493a9d 100755 --- a/core/tabs/system-setup/compile-setup.sh +++ b/core/tabs/system-setup/compile-setup.sh @@ -25,20 +25,14 @@ installDepend() { "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" "$COMPILEDEPS" ;; dnf) - "$ESCALATION_TOOL" "$PACKAGER" update -y - if ! "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable powertools; then - if ! "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable crb; then - : # Do nothing if both fail - fi - fi - if ! "$ESCALATION_TOOL" "$PACKAGER" -y install $DEPENDENCIES; then - : # Continue if package install fails - fi - if ! "$ESCALATION_TOOL" "$PACKAGER" -y group install "Development Tools"; then - "$ESCALATION_TOOL" "$PACKAGER" -y group install development-tools - fi + # shellcheck disable=SC1073 + "$ESCALATION_TOOL" "$PACKAGER" update + "$ESCALATION_TOOL" "$PACKAGER" -y config-manager --set-enabled powertools 2>/dev/null || \ + "$ESCALATION_TOOL" "$PACKAGER" -y config-manager --set-enabled crb 2>/dev/null || true + "$ESCALATION_TOOL" "$PACKAGER" -y install $DEPENDENCIES + "$ESCALATION_TOOL" "$PACKAGER" -y group install Development\ Tools 2>/dev/null || \ + "$ESCALATION_TOOL" "$PACKAGER" -y group install development-tools "$ESCALATION_TOOL" "$PACKAGER" -y install glibc-devel.i686 libgcc.i686 - ;; zypper) COMPILEDEPS='patterns-devel-base-devel_basis' "$ESCALATION_TOOL" "$PACKAGER" refresh From 93ec628fea64d538221678751fe47302fab87c26 Mon Sep 17 00:00:00 2001 From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com> Date: Fri, 14 Feb 2025 22:30:45 -0500 Subject: [PATCH 5/8] Update compile-setup.sh --- core/tabs/system-setup/compile-setup.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/core/tabs/system-setup/compile-setup.sh b/core/tabs/system-setup/compile-setup.sh index b0493a9d..159f6ada 100755 --- a/core/tabs/system-setup/compile-setup.sh +++ b/core/tabs/system-setup/compile-setup.sh @@ -26,13 +26,18 @@ installDepend() { ;; dnf) # shellcheck disable=SC1073 - "$ESCALATION_TOOL" "$PACKAGER" update - "$ESCALATION_TOOL" "$PACKAGER" -y config-manager --set-enabled powertools 2>/dev/null || \ - "$ESCALATION_TOOL" "$PACKAGER" -y config-manager --set-enabled crb 2>/dev/null || true - "$ESCALATION_TOOL" "$PACKAGER" -y install $DEPENDENCIES - "$ESCALATION_TOOL" "$PACKAGER" -y group install Development\ Tools 2>/dev/null || \ - "$ESCALATION_TOOL" "$PACKAGER" -y group install development-tools + "$ESCALATION_TOOL" "$PACKAGER" update -y + if ! "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable powertools 2>/dev/null; then + if ! "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable crb 2>/dev/null; then + : # Do nothing if both fail + fi + fi + "$ESCALATION_TOOL" "$PACKAGER" -y install "$DEPENDENCIES" + if ! "$ESCALATION_TOOL" "$PACKAGER" -y group install "Development Tools" 2>/dev/null; then + "$ESCALATION_TOOL" "$PACKAGER" -y group install development-tools + fi "$ESCALATION_TOOL" "$PACKAGER" -y install glibc-devel.i686 libgcc.i686 + ;; zypper) COMPILEDEPS='patterns-devel-base-devel_basis' "$ESCALATION_TOOL" "$PACKAGER" refresh From 5e1859ee3602cf77015192599febfa51b2af2782 Mon Sep 17 00:00:00 2001 From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com> Date: Sat, 15 Feb 2025 10:32:28 -0500 Subject: [PATCH 6/8] Update core/tabs/system-setup/compile-setup.sh Co-authored-by: Adam Perkowski --- core/tabs/system-setup/compile-setup.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/tabs/system-setup/compile-setup.sh b/core/tabs/system-setup/compile-setup.sh index 159f6ada..466fe60b 100755 --- a/core/tabs/system-setup/compile-setup.sh +++ b/core/tabs/system-setup/compile-setup.sh @@ -28,9 +28,7 @@ installDepend() { # shellcheck disable=SC1073 "$ESCALATION_TOOL" "$PACKAGER" update -y if ! "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable powertools 2>/dev/null; then - if ! "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable crb 2>/dev/null; then - : # Do nothing if both fail - fi + "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable crb 2>/dev/null || true fi "$ESCALATION_TOOL" "$PACKAGER" -y install "$DEPENDENCIES" if ! "$ESCALATION_TOOL" "$PACKAGER" -y group install "Development Tools" 2>/dev/null; then From 36430ba8b4117a6d33e337451c31c00cf3910d8d Mon Sep 17 00:00:00 2001 From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com> Date: Sat, 15 Feb 2025 10:32:45 -0500 Subject: [PATCH 7/8] Update core/tabs/system-setup/compile-setup.sh Co-authored-by: Adam Perkowski --- core/tabs/system-setup/compile-setup.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/core/tabs/system-setup/compile-setup.sh b/core/tabs/system-setup/compile-setup.sh index 466fe60b..51b2f607 100755 --- a/core/tabs/system-setup/compile-setup.sh +++ b/core/tabs/system-setup/compile-setup.sh @@ -25,7 +25,6 @@ installDepend() { "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" "$COMPILEDEPS" ;; dnf) - # shellcheck disable=SC1073 "$ESCALATION_TOOL" "$PACKAGER" update -y if ! "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable powertools 2>/dev/null; then "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable crb 2>/dev/null || true From 3b4e40108f1e66f528eb371a8cdb0ede30e16719 Mon Sep 17 00:00:00 2001 From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com> Date: Sat, 22 Feb 2025 12:57:41 -0500 Subject: [PATCH 8/8] Update compile-setup.sh --- core/tabs/system-setup/compile-setup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/tabs/system-setup/compile-setup.sh b/core/tabs/system-setup/compile-setup.sh index 51b2f607..234460e1 100755 --- a/core/tabs/system-setup/compile-setup.sh +++ b/core/tabs/system-setup/compile-setup.sh @@ -29,7 +29,8 @@ installDepend() { if ! "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable powertools 2>/dev/null; then "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable crb 2>/dev/null || true fi - "$ESCALATION_TOOL" "$PACKAGER" -y install "$DEPENDENCIES" + # shellcheck disable=SC2086 + "$ESCALATION_TOOL" "$PACKAGER" -y install $DEPENDENCIES if ! "$ESCALATION_TOOL" "$PACKAGER" -y group install "Development Tools" 2>/dev/null; then "$ESCALATION_TOOL" "$PACKAGER" -y group install development-tools fi