From 3306097f92678e5fa6febd863e5c5bf859ecad0c Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Sat, 27 Jul 2019 09:31:11 -0400
Subject: [PATCH] rebuild: fix minor errata

---
 scripts/rebuild-pkgs.rkt | 29 ++++++++++++++++++-----------
 scripts/rebuild.rkt      | 12 +++++-------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/scripts/rebuild-pkgs.rkt b/scripts/rebuild-pkgs.rkt
index e245b3e..9f0515a 100755
--- a/scripts/rebuild-pkgs.rkt
+++ b/scripts/rebuild-pkgs.rkt
@@ -64,10 +64,17 @@
 
 (define package-options
   (hash
-    'cef-standard    (hash 'asdeps #t)
-    'kmozillahelper  (hash 'asdeps #t)
-    'libsodium-git   (hash 'asdeps #t)
-    'vim-runtime-git (hash 'asdeps #t)
+    'cef-standard
+      (hash 'asdeps #t)
+
+    'kmozillahelper
+      (hash 'asdeps #t)
+
+    'libsodium-git
+      (hash 'asdeps #t)
+
+    'vim-runtime-git
+      (hash 'asdeps #t)
 
     'desmume-git
       (hash 'url (mygit "desmume-git.git"))
@@ -79,21 +86,21 @@
       (hash 'handle 'higan
             'url (gitlab "higan/higan.git/"))
 
+    'minecraft-server-fabric
+      (hash 'url (mygit "minecraft-server-fabric.git"))
+
     'otf-linjapona
       (hash 'url (mygit "otf-linjapona.git"))
 
+    'ppsspp-git
+      (hash 'url (mygit "ppsspp-git.git"))
+
     'quark-shaders
       (hash 'handle 'higan-shaders
             'url (github "hizzlekizzle/quark-shaders"))
 
-    'ppsspp-git
-      (hash 'url (mygit "ppsspp-git.git"))
-
     'teamviewer
       (hash 'url (mygit "teamviewer.git")
-            'branch "nmfix")
-
-    'minecraft-server-fabric
-      (hash 'url (mygit "minecraft-server-fabric.git"))))
+            'branch "nmfix")))
 
 ;; EOF
diff --git a/scripts/rebuild.rkt b/scripts/rebuild.rkt
index 814f855..10dbda3 100755
--- a/scripts/rebuild.rkt
+++ b/scripts/rebuild.rkt
@@ -16,8 +16,9 @@
     (eprintf "error in rebuild, aborting\n")
     (exit 1)))
 
-(define (str-or-empty hash key str)
-  (if (hash-ref hash key #f) str ""))
+(define (default-pkg-url pkg) (~a "https://aur.archlinux.org/" pkg ".git"))
+
+(define (str-or-empty hash key str) (if (hash-ref hash key #f) str ""))
 
 (define (higan-make args)
   (sys (~a "make -j12 -C " args " uninstall"))
@@ -25,9 +26,6 @@
   (sys (~a "make -j12 -C " args " all"))
   (sys (~a "make -j12 -C " args " install")))
 
-(define (default-pkg-url pkg)
-  (~a "https://aur.archlinux.org/" pkg ".git"))
-
 (define (get-latest-tag)
   (define latest
     (with-output-to-string (λ () (sys "git rev-list --tags --max-count=1"))))
@@ -63,7 +61,7 @@
            (higan-make "icarus")
            (sys "make -j12 -C shaders install")]
           [else (raise-argument-error 'build-pkg
-                                      "(or/c 'none 'higan)"
+                                      "(or/c 'none 'higan 'higan-shaders)"
                                       special-handling)])))))
 
 (define (resume-from-pkg input-pkg [pkg-list all-packages])
@@ -72,7 +70,7 @@
         pkg-list
         (resume-from-pkg input-pkg (cdr pkg-list)))))
 
-(let* ([resume-from (make-parameter null)]
+(let* ([resume-from (make-parameter '())]
        [cmdline-pkgs (command-line
                        #:once-each
                        ["--resume-from" pkg