From b1e0b662a58d5c747d124abcd0b599e6dd52c008 Mon Sep 17 00:00:00 2001 From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com> Date: Mon, 20 Jan 2025 12:20:56 -0500 Subject: [PATCH 1/3] remove tldr and trash-cli from zypper compile --- core/tabs/system-setup/compile-setup.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/tabs/system-setup/compile-setup.sh b/core/tabs/system-setup/compile-setup.sh index 746d1d5f..6836af76 100755 --- a/core/tabs/system-setup/compile-setup.sh +++ b/core/tabs/system-setup/compile-setup.sh @@ -31,11 +31,11 @@ installDepend() { "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" "$COMPILEDEPS" "$ESCALATION_TOOL" "$PACKAGER" install -y glibc-devel.i686 libgcc.i686 ;; - zypper) + zypper) COMPILEDEPS='patterns-devel-base-devel_basis' "$ESCALATION_TOOL" "$PACKAGER" refresh - "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install "$DEPENDENCIES" "$COMPILEDEPS" - "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install libgcc_s1-gcc7-32bit glibc-devel-32bit + "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install "$COMPILEDEPS" + "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install "$DEPENDENCIES libgcc_s1-gcc7-32bit glibc-devel-32bit" ;; apk) "$ESCALATION_TOOL" "$PACKAGER" add build-base multitail tar tree trash-cli unzip cmake jq From b7b03beda4968a6620b9cb5dcbee8aa4b12419cd Mon Sep 17 00:00:00 2001 From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com> Date: Mon, 20 Jan 2025 12:31:15 -0500 Subject: [PATCH 2/3] fix --- core/tabs/system-setup/compile-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/tabs/system-setup/compile-setup.sh b/core/tabs/system-setup/compile-setup.sh index 6836af76..f51f0ab4 100755 --- a/core/tabs/system-setup/compile-setup.sh +++ b/core/tabs/system-setup/compile-setup.sh @@ -31,7 +31,7 @@ installDepend() { "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" "$COMPILEDEPS" "$ESCALATION_TOOL" "$PACKAGER" install -y glibc-devel.i686 libgcc.i686 ;; - zypper) + zypper) COMPILEDEPS='patterns-devel-base-devel_basis' "$ESCALATION_TOOL" "$PACKAGER" refresh "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install "$COMPILEDEPS" From 14cff29743757b174ea649b76f3d32b11300dcf3 Mon Sep 17 00:00:00 2001 From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com> Date: Sun, 2 Feb 2025 06:29:40 -0500 Subject: [PATCH 3/3] Fix zypper compile --- core/tabs/system-setup/compile-setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/tabs/system-setup/compile-setup.sh b/core/tabs/system-setup/compile-setup.sh index f51f0ab4..01dc3258 100755 --- a/core/tabs/system-setup/compile-setup.sh +++ b/core/tabs/system-setup/compile-setup.sh @@ -34,8 +34,8 @@ installDepend() { zypper) COMPILEDEPS='patterns-devel-base-devel_basis' "$ESCALATION_TOOL" "$PACKAGER" refresh - "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install "$COMPILEDEPS" - "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install "$DEPENDENCIES libgcc_s1-gcc7-32bit glibc-devel-32bit" + "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install $COMPILEDEPS + "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install tar tree multitail unzip cmake make jq libgcc_s1-gcc7-32bit glibc-devel-32bit ;; apk) "$ESCALATION_TOOL" "$PACKAGER" add build-base multitail tar tree trash-cli unzip cmake jq