mirror of
https://github.com/TrezOne/docker-mods-uptime-kuma-timeout-fix.git
synced 2026-07-21 10:34:14 -04:00
Extract package check out of the rust bin condition
This commit is contained in:
@@ -13,11 +13,14 @@ if [[ ! " ${SUPPORTED_ARCHS[@]} " =~ " ${ARCH} " ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
RUST_BINARY_ARCHIVE_PATH="$RUST_BINS_PATH/rust-$ARCH-gnu.tar.gz"
|
if ! dpkg -l | grep build-essential >/dev/null; then
|
||||||
|
echo "**** adding build-essential to install list ****"
|
||||||
|
echo "build-essential" >>"$PACKAGES_TO_INSTALL_LIST"
|
||||||
|
else
|
||||||
|
echo "**** build-essential already installed ****"
|
||||||
|
fi
|
||||||
|
|
||||||
grep_os_release() {
|
RUST_BINARY_ARCHIVE_PATH="$RUST_BINS_PATH/rust-$ARCH-gnu.tar.gz"
|
||||||
grep -q "$1" /etc/os-release && true || false
|
|
||||||
}
|
|
||||||
|
|
||||||
if [[ -f "$RUST_BINARY_ARCHIVE_PATH" ]]; then
|
if [[ -f "$RUST_BINARY_ARCHIVE_PATH" ]]; then
|
||||||
echo "**** unpacking rust tar ****"
|
echo "**** unpacking rust tar ****"
|
||||||
@@ -26,13 +29,6 @@ if [[ -f "$RUST_BINARY_ARCHIVE_PATH" ]]; then
|
|||||||
echo "**** installing rust ****"
|
echo "**** installing rust ****"
|
||||||
"$RUST_BINS_PATH/install.sh"
|
"$RUST_BINS_PATH/install.sh"
|
||||||
rm -rf "$RUST_BINS_PATH"
|
rm -rf "$RUST_BINS_PATH"
|
||||||
|
|
||||||
echo "**** adding build tools ****"
|
|
||||||
if grep_os_release "debian"; then
|
|
||||||
echo "build-essential" >>"$PACKAGES_TO_INSTALL_LIST"
|
|
||||||
else
|
|
||||||
echo "gcc" >>"$PACKAGES_TO_INSTALL_LIST"
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
echo "**** rust already installed ****"
|
echo "**** rust bin does not exist ****"
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user