Better handle startup and launcherctl info

Eeems-Org · Sep 10, 2024 · 19d14f1 · 19d14f1
1 parent a0eef7f
commit 19d14f1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/assets/etc/systemd/system/tarnish.service b/assets/etc/systemd/system/tarnish.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Oxide system service
 After=home.mount
+After=blight.service
 StartLimitInterval=30
 StartLimitBurst=5
 #OnFailure=remarkable-fail.service
@@ -21,4 +22,5 @@ Environment="PATH=/opt/bin:/opt/sbin:/opt/usr/bin:/usr/local/bin:/usr/bin:/bin:/
 
 [Install]
 Alias=launcher.service
+Alias=oxide.service
 WantedBy=multi-user.target
diff --git a/assets/opt/share/launcherctl/oxide b/assets/opt/share/launcherctl/oxide
@@ -27,13 +27,23 @@ case "$1" in
         systemctl disable tarnish.service
         ;;
     apps)
-        rot apps get applications | jq -r 'keys | .[]'
+        if ! "$0" is-active; then
+            \ls /opt/usr/share/applications/*.oxide | xargs basename -s .oxide
+            exit
+        fi
+        rot apps get applications 2>/dev/null | jq -r 'keys | .[]'
         ;;
     running)
-        rot apps get runningApplications | jq -r 'keys | .[]'
+        if ! "$0" is-active; then
+            exit
+        fi
+        rot apps get runningApplications 2>/dev/null | jq -r 'keys | .[]'
         ;;
     paused)
-        rot apps get pausedApplications | jq -r 'keys | .[]'
+        if ! "$0" is-active; then
+            exit
+        fi
+        rot apps get pausedApplications 2>/dev/null | jq -r 'keys | .[]'
         ;;
     launch | resume)
         rot apps get applications \