From 8f7ca830e1da9d77694aeb7790f937bdd625332a Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen@aminda.eu>
Date: Wed, 30 Apr 2025 16:14:06 +0300
Subject: [PATCH] bash/usr-local-bin: cleanup as no more SteamOS

---
 bash/usr-local-bin/kile                       |  5 ++--
 bash/usr-local-bin/meld                       |  5 ++--
 bash/usr-local-bin/mpv                        | 17 -------------
 bash/usr-local-bin/nvim                       | 25 +++++++++----------
 .../{steam => steam.wrapper.bak}              |  0
 5 files changed, 16 insertions(+), 36 deletions(-)
 delete mode 100755 bash/usr-local-bin/mpv
 rename bash/usr-local-bin/{steam => steam.wrapper.bak} (100%)

diff --git a/bash/usr-local-bin/kile b/bash/usr-local-bin/kile
index 8b16746..797efbb 100755
--- a/bash/usr-local-bin/kile
+++ b/bash/usr-local-bin/kile
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
-# In case we are on SteamOS?
-#set -x
+set -x
 # The usual system-wide installation
 if [ -f /usr/bin/kile ]; then
 	/usr/bin/kile "$@"
@@ -14,4 +13,4 @@ elif [ -f ~/.local/share/flatpak/exports/bin/org.kde.kile ]; then
 else
 	printf "kile doesn't seem to be installed :("
 fi
-#set +x
+set +x
diff --git a/bash/usr-local-bin/meld b/bash/usr-local-bin/meld
index f73b87d..a84e074 100755
--- a/bash/usr-local-bin/meld
+++ b/bash/usr-local-bin/meld
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
-# In case we are on SteamOS?
-#set -x
+set -x
 # The usual system-wide installation
 if [ -f /usr/bin/meld ]; then
 	/usr/bin/meld "$@"
@@ -14,4 +13,4 @@ elif [ -f ~/.local/share/flatpak/exports/bin/org.gnome.meld ]; then
 else
 	printf "meld doesn't seem to be installed :("
 fi
-#set +x
+set +x
diff --git a/bash/usr-local-bin/mpv b/bash/usr-local-bin/mpv
deleted file mode 100755
index fe7681d..0000000
--- a/bash/usr-local-bin/mpv
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-# In case we are on SteamOS?
-#set -x
-# The usual system-wide installation
-if [ -f /usr/bin/mpv ]; then
-	/usr/bin/mpv "$@"
-# System-wide flatpak
-elif [ -f /var/lib/flatpak/exports/bin/io.mpv.Mpv ]; then
-	flatpak run io.mpv.Mpv "$@"
-# User-specific flatpak
-elif [ -f ~/.local/share/flatpak/exports/bin/io.mpv.Mpv ]; then
-	flatpak run --user io.mpv.Mpv "$@"
-# If not found.
-else
-	printf "mpv doesn't seem to be installed :("
-fi
-#set +x
diff --git a/bash/usr-local-bin/nvim b/bash/usr-local-bin/nvim
index 1b1b83e..5cd9401 100755
--- a/bash/usr-local-bin/nvim
+++ b/bash/usr-local-bin/nvim
@@ -1,25 +1,24 @@
 #!/usr/bin/env bash
-# In case we are on SteamOS?
 set -x
 # The usual system-wide installation
 if [ -f /usr/bin/nvim ]; then
 	/usr/bin/nvim "$@"
-# System-wide flatpak
-elif [ -f /var/lib/flatpak/exports/bin/io.neovim.nvim ]; then
-	flatpak run io.neovim.nvim "$@"
-# User-specific flatpak
-elif [ -f ~/.local/share/flatpak/exports/bin/io.neovim.nvim ]; then
-	flatpak run --user io.neovim.nvim "$@"
+	# System-wide flatpak
+	#elif [ -f /var/lib/flatpak/exports/bin/io.neovim.nvim ]; then
+	#	flatpak run io.neovim.nvim "$@"
+	# User-specific flatpak
+	#elif [ -f ~/.local/share/flatpak/exports/bin/io.neovim.nvim ]; then
+	#	flatpak run --user io.neovim.nvim "$@"
 	# Snap
-elif [ -f /snap/bin/nvim ]; then
-	snap run nvim "$@"
+#elif [ -f /snap/bin/nvim ]; then
+#	snap run nvim "$@"
 # Fallback to vim, because this script breaks my alias/function
 elif [ -f /usr/bin/vim ]; then
 	/usr/bin/vim "$@"
-elif [ -f /var/lib/flatpak/exports/bin/org.vim.Vim ]; then
-	flatpak run org.vim.Vim "$@"
-elif [ -f ~/.local/share/flatpak/exports/bin/org.vim.Vim ]; then
-	flatpak run --user org.vim.Vim "$@"
+#elif [ -f /var/lib/flatpak/exports/bin/org.vim.Vim ]; then
+#	flatpak run org.vim.Vim "$@"
+#elif [ -f ~/.local/share/flatpak/exports/bin/org.vim.Vim ]; then
+#	flatpak run --user org.vim.Vim "$@"
 # Fallback to Vi is acceptable.
 elif [ -f /usr/bin/vi ]; then
 	/usr/bin/vi "$@"
diff --git a/bash/usr-local-bin/steam b/bash/usr-local-bin/steam.wrapper.bak
similarity index 100%
rename from bash/usr-local-bin/steam
rename to bash/usr-local-bin/steam.wrapper.bak