JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixes building on Linux Mint Tricia (Bionic based) (#1914)

Browse Source 
* Replace apt with apt-get unless in chroot
* Improve support for Buster and Mint Debbie

Co-authored-by: Igor Pečovnik <igorpecovnik@users.noreply.github.com>
This commit is contained in:
Werner
2020-04-25 21:25:05 +02:00
committed by GitHub
parent c25a1b96b0
commit f78591db5b
5 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
compile.sh
View File

@@ -86,15 +86,15 @@ rm $TMPFILE
# Check for required packages for compiling
if [[ -z "$(which dialog)" ]]; then
sudo apt update
sudo apt install -y dialog
sudo apt-get update
sudo apt-get install -y dialog
fi
# Check for Vagrant
if [[ "$1" == vagrant && -z "$(which vagrant)" ]]; then
display_alert "Vagrant not installed." "Installing"
sudo apt update
sudo apt install -y vagrant virtualbox
sudo apt-get update
sudo apt-get install -y vagrant virtualbox
fi
if [[ "$1" == dockerpurge && -f /etc/debian_version ]]; then
@@ -129,12 +129,12 @@ if [[ "$1" == docker && -f /etc/debian_version && -z "$(which docker)" ]]; then
do
[[ ! $(which $i) ]] && install_packages+=$i" "
done
[[ -z $install_packages ]] && apt update;apt install -y -qq --no-install-recommends $install_packages
[[ -z $install_packages ]] && apt-get update;apt-get install -y -qq --no-install-recommends $install_packages
curl -fsSL "https://download.docker.com/linux/${codeid}/gpg" | apt-key add -qq - > /dev/null 2>&1
export DEBIAN_FRONTEND=noninteractive
apt update
apt install -y -qq --no-install-recommends docker-ce
apt-get update
apt-get install -y -qq --no-install-recommends docker-ce
display_alert "Add yourself to docker group to avoid root privileges" "" "wrn"
"$SRC/compile.sh" "$@"
exit $?