From c1c6c31abbbc32c4d0fcad586693e072199c1c89 Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Mon, 10 Jun 2019 18:10:58 -0400
Subject: [PATCH] rebuild: use a custom pkgbuild for ppsspp instead of hacks

---
 scripts/rebuild.sh      | 23 ++---------------------
 scripts/rebuild_pkgs.sh |  2 +-
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/scripts/rebuild.sh b/scripts/rebuild.sh
index 009d872..ee95a62 100755
--- a/scripts/rebuild.sh
+++ b/scripts/rebuild.sh
@@ -23,8 +23,7 @@ build_package() {
    shift
 
    local special_handling="None"
-   local install_as
-   local makepkg_args="-srLcCf --noconfirm"
+   local makepkg_args="-isrLcCf --noconfirm"
    local pull_url="https://aur.archlinux.org/$pkg.git"
    local branch
 
@@ -43,10 +42,6 @@ build_package() {
             branch=-b "$2"
             shift 2
             ;;
-         --install-as)
-            install_as=$2
-            shift 2
-            ;;
          --asdeps|--skipinteg|-f)
             makepkg_args+=" $1"
             shift
@@ -77,7 +72,7 @@ build_package() {
          git checkout "$new_tag"
          higan_make higan target=higan
          higan_make icarus
-         make -j12 -C shaders install
+         make -j12 -C shaders install || exit_on_err
          return
          ;;
       *)
@@ -86,21 +81,7 @@ build_package() {
          ;;
    esac
 
-   if [[ ! $install_as ]]
-   then
-      makepkg_args+=" -i"
-   fi
-
    makepkg $makepkg_args || exit_on_err
-
-   local pkgver
-
-   if [[ $install_as ]]
-   then
-      pkgver=$(pkg_ver)
-      sudo pacman --noconfirm --needed -U "$install_as-$pkgver*.pkg.tar" ||
-         exit_on_err
-   fi
 }
 resume_from() {
    local resume
diff --git a/scripts/rebuild_pkgs.sh b/scripts/rebuild_pkgs.sh
index 3ea45f9..e15a0a2 100644
--- a/scripts/rebuild_pkgs.sh
+++ b/scripts/rebuild_pkgs.sh
@@ -62,7 +62,7 @@ declare -A options=(
    [gdcc-git]="--url $greyserv_git/gdcc-git.git"
    [higan]="--handle Higan --url https://gitlab.com/higan/higan.git/"
    [motsognir]="--url $greyserv_git/motsognir.git"
-   [ppsspp-git]="--install-as ppsspp-git"
+   [ppsspp-git]="--url $greyserv_git/ppsspp-git.git"
    [teamviewer]="--url $greyserv_git/teamviewer.git --branch nmfix"
    [minecraft-server-fabric]="--url $greyserv_git/minecraft-server-fabric.git"
 )