From 313ef306620fe03eb227c9aa03f7a842ca7586c0 Mon Sep 17 00:00:00 2001 From: Filippo Squillace Date: Fri, 9 Aug 2019 21:19:37 +1000 Subject: [PATCH] Add aurutils to the check build script --- lib/checks/check.sh | 7 +++---- lib/core/common.sh | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/checks/check.sh b/lib/checks/check.sh index 9bf99ea..cba999b 100755 --- a/lib/checks/check.sh +++ b/lib/checks/check.sh @@ -44,7 +44,7 @@ pacman --noconfirm -Su pacman --noconfirm -S grep coreutils pacman --noconfirm -S $(pacman -Sg base-devel | cut -d ' ' -f 2 | grep -v sudo) -info "Checking essential executables work..." +info "Checking basic executables work..." pacman -Qi pacman 1> /dev/null yogurt -V 1> /dev/null /opt/proot/proot-$ARCH --help 1> /dev/null @@ -63,11 +63,10 @@ pacman --noconfirm -Rsn ${repo_package2} if ! $SKIP_AUR_TESTS then - aur_package=cower + aur_package=aurutils info "Checking ${aur_package} package from AUR repo..." - gpg --recv-key --keyserver hkp://pgp.mit.edu 1EB2638FF56C0C53 yogurt -A --noconfirm -S ${aur_package} - ${aur_package} --help + aur search aur 1> /dev/null pacman --noconfirm -Rsn ${aur_package} fi diff --git a/lib/core/common.sh b/lib/core/common.sh index faa1de8..996c24f 100644 --- a/lib/core/common.sh +++ b/lib/core/common.sh @@ -151,7 +151,8 @@ function proot_cmd(){ ${PROOT} ${proot_args} "${@}" elif PROOT_NO_SECCOMP=1 ${PROOT} ${proot_args} "${SH[@]}" "-c" ":" then - warn "Warn: Proot is not working, disabling SECCOMP instead. Expect the application to run slowly in particular when it uses syscalls intensively." + warn "Warn: Proot is not properly working. Disabling SECCOMP and expect the application to run slowly in particular when it uses syscalls intensively." + warn "Try to use Linux namespace instead as it is more reliable: junest -u" PROOT_NO_SECCOMP=1 ${PROOT} ${proot_args} "${@}" else die "Error: Something went wrong with proot command. Exiting"