From d9d6b0f8868d038080d9319c3a1efdd0f68adacb Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sat, 18 Apr 2020 05:37:15 +0200 Subject: [PATCH] Pikaur is broken, use Yay instead --- makepkg.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/makepkg.sh b/makepkg.sh index 0a51d5d..12aed7e 100755 --- a/makepkg.sh +++ b/makepkg.sh @@ -16,17 +16,17 @@ fi if [ "$PLUGIN_INSTALL" != "" ]; then echo "Installing packages before build: $PLUGIN_INSTALL" - pikaur -Syu --noprogressbar --noconfirm $(echo "$PLUGIN_INSTALL" | tr ',' ' ') + yay -Syu --noprogressbar --noconfirm --mflags=-A $(echo "$PLUGIN_INSTALL" | tr ',' ' ') fi if [ "$PLUGIN_INSTALL_OUTPUTS" != "no" ] && [ -n "$(ls -A "$OUTDIR")" ]; then echo "Installing previous build outputs" - pikaur -U --noprogressbar --noconfirm "$OUTDIR"/* + yay -U --noprogressbar --noconfirm "$OUTDIR"/* fi # Clone package repo if [ "$PLUGIN_AUR" != "" ]; then - echo "Building AUR package $PLUGIN_AUR" + echo "Building AUR package: $PLUGIN_AUR" git clone "$AUR_URL/$PLUGIN_AUR.git" package cd package elif [ "$PLUGIN_REPO" != "" ]; then @@ -44,9 +44,9 @@ if [ "$PLUGIN_PKGBUILD" != "" ]; then fi echo "Running build" -pikaur -P --noprogressbar --noconfirm --mflags=--ignorearch "$PKGBUILD" +makepkg -sAc --skippgpcheck --noconfirm --noprogressbar "$PKGBUILD" echo "Moving packages to output directory: $OUTDIR" -mv ~/.cache/pikaur/pkg/* "$OUTDIR/" +mv *.pkg.* "$OUTDIR/" sudo chown -R root:root "$DRONE_WORKSPACE_BASE"