From 2f5ff0027f5306da02d97f76c8c459170d394711 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sat, 18 Apr 2020 06:51:26 +0200 Subject: [PATCH] Ensure source dir name doesn't collide with package name --- makepkg.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/makepkg.sh b/makepkg.sh index 505f5b8..a4e9187 100755 --- a/makepkg.sh +++ b/makepkg.sh @@ -10,8 +10,10 @@ sudo mkdir -p "$OUTDIR" sudo chown -R builder:builder "$OUTDIR" export PKGDEST="$OUTDIR" -export SRCDEST="$HOME" -export BUILDDIR="$HOME" +export SRCDEST="$HOME/sources" +export BUILDDIR="$HOME/builddir" +mkdir -p "$SRCDEST" +mkdir -p "$BUILDDIR" if [ "$PLUGIN_AUTO_MAKEFLAGS" != "no" ]; then echo "MAKEFLAGS='-j$(nproc)'" | sudo tee -a /etc/makepkg.conf @@ -43,6 +45,6 @@ else fi echo "Running build" -makepkg -sAc --skippgpcheck --noconfirm --noprogressbar "$PKGBUILD" +makepkg -sAc --skippgpcheck --noconfirm --noprogressbar sudo chown -R root:root "$OUTDIR"