Merge branch 'main' into deployment-target-macOS-13

F1248 · Aug 23, 2024 · 972494a · 972494a
2 parents 9da976c + c396316
commit 972494a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/Genius/Types/OSBootMode.swift b/Genius/Types/OSBootMode.swift
@@ -14,7 +14,7 @@ enum OSBootMode {
     case recovery
 
     init?(_ osBootMode: Any?) {
-        if FileManager.default.fileExists(atPath: "/usr/bin/recoverydiagnose") {
+        if !FileManager.default.fileExists(atPath: "/System/Library/CoreServices/Finder.app") {
             self = .recovery
         } else {
             let osBootMode: Self? =

diff --git a/install.sh b/install.sh
@@ -2,15 +2,11 @@
 
 /bin/echo "
 Preparing..."
-if [ -e /usr/bin/recoverydiagnose ]; then
-   cd ~
+if [ -w /Applications ]; then
+    cd /Applications
 else
-   if [ -w /Applications ]; then
-      cd /Applications
-   else
-      /bin/mkdir -p ~/Applications
-      cd ~/Applications
-   fi
+    /bin/mkdir -p ~/Applications
+    cd ~/Applications
 fi
 
 /bin/echo "Downloading..."
@@ -19,17 +15,19 @@ fi
 /bin/echo "Installing..."
 /usr/bin/unzip -q -o Genius.zip
 /usr/bin/unzip -q -o Genius.zip
+if [ ! -e /System/Library/CoreServices/Finder.app ]; then
+    /bin/echo "
+export PATH=\"$(/bin/pwd)/Genius.app/Contents/MacOS:\$PATH\"" >> ~/.bash_profile
+fi
 
 /bin/echo "Cleaning up..."
 /bin/rm Genius.zip
 
 /bin/echo "Opening..."
 if [ -e /usr/bin/open ]; then
-   /usr/bin/open Genius.app
+    /usr/bin/open Genius.app
 else
-   /bin/echo "
-export PATH=\"$HOME/Genius.app/Contents/MacOS:\$PATH\"" >> ~/.bash_profile
-   Genius.app/Contents/MacOS/Genius
+    Genius.app/Contents/MacOS/Genius
 fi
 
 /bin/echo "Done."