From 8878630c029b53bcdb8abe0c5b1bea14b2aa9d50 Mon Sep 17 00:00:00 2001
From: RJ Trujillo <eyecantcu@pm.me>
Date: Tue, 18 Jul 2023 11:47:57 -0600
Subject: [PATCH] Revert "feat(just): Default to using bash"

This doesn't work as intended. Each command instantiates a new shell making this
a hurdle for readability, so remove it instead and continue explicitly defining
the environment

This reverts commit 982be6c44fe65205ef6cbd59785a3883d1052ee2.
---
 system_files/deck/usr/share/ublue-os/just/custom.just    | 8 ++++++--
 system_files/desktop/usr/share/ublue-os/just/custom.just | 6 ++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/system_files/deck/usr/share/ublue-os/just/custom.just b/system_files/deck/usr/share/ublue-os/just/custom.just
index 1eb14f5e..e3fa76b1 100644
--- a/system_files/deck/usr/share/ublue-os/just/custom.just
+++ b/system_files/deck/usr/share/ublue-os/just/custom.just
@@ -1,5 +1,3 @@
-set shell := ["bash", "-c"]
-
 enable-gamescope-autologin:
   systemctl disable --now plasma-autologin
   systemctl enable --now gamescope-autologin
@@ -45,6 +43,7 @@ enable-wallpaper-engine:
   rm -rf /tmp/wallpaper-engine-kde-plugin
 
 deckswap-on:
+  #!/usr/bin/env bash
   STATUS=$(systemctl status deckswap.service)
   if grep 'inactive' <<< ${STATUS}; then
     systemctl enable deckswap.service
@@ -54,6 +53,7 @@ deckswap-on:
   fi
 
 deckswap-off:
+  #!/usr/bin/env bash
   STATUS=$(systemctl status deckswap.service)
   if grep -v 'inactive' <<< ${STATUS}; then
     systemctl disable deckswap.service
@@ -63,6 +63,7 @@ deckswap-off:
   fi
 
 resize-deckswap:
+  #!/usr/bin/env bash
   CONFIG='/etc/default/deckswap'
   CURRENT_SIZE=$(cat "${CONFIG}" | sed 's/SWAP_SIZE=//g')
   echo 'Current size: '${CURRENT_SIZE}
@@ -84,6 +85,7 @@ resize-deckswap:
   fi
 
 zram-on:
+  #!/usr/bin/env bash
   KARGS=$(rpm-ostree kargs)
   if grep 'zram' <<< ${KARGS}; then
     rpm-ostree kargs --delete=zram
@@ -93,6 +95,7 @@ zram-on:
   fi
 
 zram-off:
+  #!/usr/bin/env bash
   KARGS=$(rpm-ostree kargs)
   if grep -v 'zram' <<< ${KARGS}; then
     rpm-ostree kargs --append=zram=0
@@ -102,6 +105,7 @@ zram-off:
   fi
 
 resize-zram:
+  #!/usr/bin/env bash
   CONFIG='/etc/systemd/zram-generator.conf'
   CURRENT_SIZE=$(cat "${CONFIG}" | sed 's/zram-size=//g')
   echo 'Current size: '${CURRENT_SIZE}
diff --git a/system_files/desktop/usr/share/ublue-os/just/custom.just b/system_files/desktop/usr/share/ublue-os/just/custom.just
index 47872073..dd4dbb69 100644
--- a/system_files/desktop/usr/share/ublue-os/just/custom.just
+++ b/system_files/desktop/usr/share/ublue-os/just/custom.just
@@ -1,6 +1,5 @@
-set shell := ["bash", "-c"]
-
 install-bazzite-arch:
+  #!/usr/bin/env bash
   KARGS=$(rpm-ostree kargs)
   if grep 'nvidia' <<< ${KARGS}; then
     echo 'Installing Bazzite Arch (Nvidia)...'
@@ -39,6 +38,7 @@ enable-wallpaper-engine:
   rm -rf /tmp/wallpaper-engine-kde-plugin
 
 zram-on:
+  #!/usr/bin/env bash
   KARGS=$(rpm-ostree kargs)
   if grep 'zram' <<< ${KARGS}; then
     rpm-ostree kargs --delete=zram
@@ -48,6 +48,7 @@ zram-on:
   fi
 
 zram-off:
+  #!/usr/bin/env bash
   KARGS=$(rpm-ostree kargs)
   if grep -v 'zram' <<< ${KARGS}; then
     rpm-ostree kargs --append=zram=0
@@ -57,6 +58,7 @@ zram-off:
   fi
 
 resize-zram:
+  #!/usr/bin/env bash
   CONFIG='/etc/systemd/zram-generator.conf'
   CURRENT_SIZE=$(cat "${CONFIG}" | sed 's/zram-size=//g')
   echo 'Current size: '${CURRENT_SIZE}