flygard/flygard-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(Apps/Installer): Prepend env to prevent script failure in root shell (#26999)

Browse source
This commit is contained in:
Brian 2026-08-11 20:10:41 +02:00 committed by GitHub
parent 6501ebe734
commit 06f1a9755f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/installer/includes/os_configs/ubuntu.sh
View file

@ -29,7 +29,7 @@ esac
$SUDO apt update $SUDO apt update
# shared deps # shared deps
$SUDO DEBIAN_FRONTEND="noninteractive" \ $SUDO env DEBIAN_FRONTEND="noninteractive" \
apt-get -y install ccache clang cmake curl make unzip jq screen tmux \ apt-get -y install ccache clang cmake curl make unzip jq screen tmux \
libreadline-dev libbz2-dev git gcc g++ libssl-dev \ libreadline-dev libbz2-dev git gcc g++ libssl-dev \
libncurses-dev libboost-all-dev gdb gdbserver expect libncurses-dev libboost-all-dev gdb gdbserver expect
@ -39,10 +39,10 @@ if [[ "$UBUNTU_VERSION" == "26.04" ]]; then
# libstdc++-16-dev: clang 21 links against the GCC 16 toolchain, while the # libstdc++-16-dev: clang 21 links against the GCC 16 toolchain, while the
# default g++ is GCC 15 and only brings the GCC 15 C++ dev files, so cmake # default g++ is GCC 15 and only brings the GCC 15 C++ dev files, so cmake
# fails with "cannot find -lstdc++" without it. # fails with "cannot find -lstdc++" without it.
$SUDO DEBIAN_FRONTEND="noninteractive" \ $SUDO env DEBIAN_FRONTEND="noninteractive" \
apt-get -y install libgoogle-perftools-dev default-libmysqlclient-dev libstdc++-16-dev apt-get -y install libgoogle-perftools-dev default-libmysqlclient-dev libstdc++-16-dev
else else
$SUDO DEBIAN_FRONTEND="noninteractive" \ $SUDO env DEBIAN_FRONTEND="noninteractive" \
apt-get -y install google-perftools libmysqlclient-dev libncurses5-dev libncursesw5-dev apt-get -y install google-perftools libmysqlclient-dev libncurses5-dev libncursesw5-dev
fi fi
@ -56,10 +56,10 @@ if [[ $DOCKER != 1 && $SKIP_MYSQL_INSTALL != 1 ]]; then
wget https://dev.mysql.com/get/mysql-apt-config_0.8.35-1_all.deb -P "$VAR_PATH" wget https://dev.mysql.com/get/mysql-apt-config_0.8.35-1_all.deb -P "$VAR_PATH"
# resolve expired key issue # resolve expired key issue
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A8D3785C sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A8D3785C
$SUDO DEBIAN_FRONTEND="noninteractive" dpkg -i "$VAR_PATH/mysql-apt-config_0.8.35-1_all.deb" $SUDO env DEBIAN_FRONTEND="noninteractive" dpkg -i "$VAR_PATH/mysql-apt-config_0.8.35-1_all.deb"
$SUDO apt-get update $SUDO apt-get update
fi fi
$SUDO DEBIAN_FRONTEND="noninteractive" apt-get install -y mysql-server $SUDO env DEBIAN_FRONTEND="noninteractive" apt-get install -y mysql-server
fi fi