Merge desktop branch (#2662)

Co-authored-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
Co-authored-by: Igor Pečovnik <igorpecovnik@users.noreply.github.com>
Co-authored-by: Richard Neese <r.neese@gmail.com>
Co-authored-by: iav <iav@iav.lv>
Co-authored-by: lanefu <lanefu@users.noreply.github.com>
Co-authored-by: Werner <EvilOlaf@users.noreply.github.com>
Co-authored-by: Oleg <balbes-150@yandex.ru>
Co-authored-by: Lane Jennison <lane@lane-fu.com>
Co-authored-by: JMCC <jmcc1@gmx.com>
This commit is contained in:
Igor Pečovnik
2021-02-24 18:19:09 +01:00
committed by GitHub
parent 789fe94137
commit 3a74abe43d
236 changed files with 3959 additions and 1202 deletions

View File

@@ -126,6 +126,10 @@ if [[ -z "$(command -v getfacl)" ]]; then
sudo apt-get update
sudo apt-get install -y acl
fi
if [[ -z "$(command -v uuidgen)" ]]; then
sudo apt-get update
sudo apt-get install -y uuid-runtime
fi
# Check for Vagrant
if [[ "${1}" == vagrant && -z "$(command -v vagrant)" ]]; then