fix builds essentials for debian based systems (#1075)
* fix builds for debian * eopkg * fixed void installs * Update compile-setup.sh * fix be nice if i could write code correctly the first time
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
#!/bin/sh -e
|
#!/bin/sh -e
|
||||||
|
# shellcheck disable=SC2086
|
||||||
|
|
||||||
. ../common-script.sh
|
. ../common-script.sh
|
||||||
|
|
||||||
@@ -15,21 +16,20 @@ installDepend() {
|
|||||||
else
|
else
|
||||||
printf "%b\n" "${GREEN}Multilib is already enabled.${RC}"
|
printf "%b\n" "${GREEN}Multilib is already enabled.${RC}"
|
||||||
fi
|
fi
|
||||||
"$AUR_HELPER" -S --needed --noconfirm "$DEPENDENCIES"
|
"$AUR_HELPER" -S --needed --noconfirm $DEPENDENCIES
|
||||||
;;
|
;;
|
||||||
apt-get|nala)
|
apt-get|nala)
|
||||||
COMPILEDEPS='build-essential'
|
COMPILEDEPS='build-essential'
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" update
|
"$ESCALATION_TOOL" "$PACKAGER" update
|
||||||
"$ESCALATION_TOOL" dpkg --add-architecture i386
|
"$ESCALATION_TOOL" dpkg --add-architecture i386
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" update
|
"$ESCALATION_TOOL" "$PACKAGER" update
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" "$COMPILEDEPS"
|
"$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES $COMPILEDEPS
|
||||||
;;
|
;;
|
||||||
dnf)
|
dnf)
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" update -y
|
"$ESCALATION_TOOL" "$PACKAGER" update -y
|
||||||
if ! "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable powertools 2>/dev/null; then
|
if ! "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable powertools 2>/dev/null; then
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" config-manager --enable crb 2>/dev/null || true
|
"$ESCALATION_TOOL" "$PACKAGER" config-manager --enable crb 2>/dev/null || true
|
||||||
fi
|
fi
|
||||||
# shellcheck disable=SC2086
|
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" -y install $DEPENDENCIES
|
"$ESCALATION_TOOL" "$PACKAGER" -y install $DEPENDENCIES
|
||||||
if ! "$ESCALATION_TOOL" "$PACKAGER" -y group install "Development Tools" 2>/dev/null; then
|
if ! "$ESCALATION_TOOL" "$PACKAGER" -y group install "Development Tools" 2>/dev/null; then
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" -y group install development-tools
|
"$ESCALATION_TOOL" "$PACKAGER" -y group install development-tools
|
||||||
@@ -47,20 +47,18 @@ installDepend() {
|
|||||||
;;
|
;;
|
||||||
xbps-install)
|
xbps-install)
|
||||||
COMPILEDEPS='base-devel'
|
COMPILEDEPS='base-devel'
|
||||||
# shellcheck disable=SC2086
|
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" -Sy $DEPENDENCIES $COMPILEDEPS
|
"$ESCALATION_TOOL" "$PACKAGER" -Sy $DEPENDENCIES $COMPILEDEPS
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" -Sy void-repo-multilib
|
"$ESCALATION_TOOL" "$PACKAGER" -Sy void-repo-multilib
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" -Sy glibc-32bit gcc-multilib
|
"$ESCALATION_TOOL" "$PACKAGER" -Sy glibc-32bit gcc-multilib
|
||||||
;;
|
;;
|
||||||
eopkg)
|
eopkg)
|
||||||
# shellcheck disable=SC2086
|
|
||||||
COMPILEDEPS='-c system.devel'
|
COMPILEDEPS='-c system.devel'
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" update-repo
|
"$ESCALATION_TOOL" "$PACKAGER" update-repo
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" install -y tar tree unzip cmake make jq
|
"$ESCALATION_TOOL" "$PACKAGER" install -y tar tree unzip cmake make jq
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" "$COMPILEDEPS"
|
"$ESCALATION_TOOL" "$PACKAGER" install -y $COMPILEDEPS
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES"
|
"$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user