From 4c348e7d17da03f08f8568e7bb63fb0311e5d93a Mon Sep 17 00:00:00 2001
From: Danielle McLean <dani@00dani.me>
Date: Mon, 11 Mar 2019 13:20:16 +1100
Subject: [PATCH] Fix up Andromeda path manipulation to work with newer
 Andromedae that use multiple paths

---
 local/bin/andromeda | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/local/bin/andromeda b/local/bin/andromeda
index ab8b5c4..e958c0d 100755
--- a/local/bin/andromeda
+++ b/local/bin/andromeda
@@ -10,8 +10,10 @@ shell() {
 }
 
 # Let's first grab the location where Andromeda is installed
-pkg="$(shell pm path projekt.andromeda)"
-pkg=${pkg#package:}
+pkg=( "$(shell pm path projekt.andromeda)" )
+pkg=( ${(f)pkg} )
+pkg=( ${pkg#package:} )
+# These steps could all be done as a one-liner but this way is easier to read.
 
 # Quit Substratum if it's running.
 shell am force-stop projekt.substratum
@@ -28,5 +30,5 @@ print "Launching Andromeda..." >&2
 shell <<EOF
 appops set projekt.andromeda RUN_IN_BACKGROUND allow
 appops set projekt.substratum RUN_IN_BACKGROUND allow
-CLASSPATH=$pkg app_process /system/bin --nice-name=andromeda projekt.andromeda.Andromeda >/dev/null 2>&1 &
+CLASSPATH=${(j.:.)pkg} app_process /system/bin --nice-name=andromeda projekt.andromeda.Andromeda >/dev/null 2>&1 &
 EOF