clean up / move files around for clarity

ChimeraOS · May 7, 2024 · 388fae2 · 388fae2
1 parent 489e344
commit 388fae2
Show file tree

Hide file tree

Showing 86 changed files with 100 additions and 130 deletions.
diff --git a/bin/32x b/bin/32x
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher 32x picodrive "$@"
diff --git a/bin/3do b/bin/3do
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher 3do opera "$@"
diff --git a/launchers/appimage → bin/appimage b/launchers/appimage → bin/appimage
diff --git a/bin/arcade b/bin/arcade
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher arcade mame "$@"
diff --git a/bin/atari-2600 b/bin/atari-2600
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher atari-2600 stella2014 "$@"
diff --git a/bin/atari-7800 b/bin/atari-7800
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher atari-7800 prosystem "$@"
diff --git a/launchers/chimera-cart-loader → bin/chimera-cart-loader b/launchers/chimera-cart-loader → bin/chimera-cart-loader
diff --git a/bin/dreamcast b/bin/dreamcast
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher dreamcast flycast "$@"
diff --git a/launchers/epic-store → bin/epic-store b/launchers/epic-store → bin/epic-store
diff --git a/bin/gb b/bin/gb
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher gb mgba "$@"
diff --git a/bin/gba b/bin/gba
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher gba mgba "$@"
diff --git a/bin/gbc b/bin/gbc
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher gbc mgba "$@"
diff --git a/bin/genesis b/bin/genesis
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher genesis genesis_plus_gx "$@"
diff --git a/launchers/gog-launcher → bin/gog-launcher b/launchers/gog-launcher → bin/gog-launcher
diff --git a/bin/jaguar b/bin/jaguar
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher jaguar virtualjaguar "$@"
diff --git a/bin/msdos b/bin/msdos
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/usr/libexec/chimera/launcher msdos dosbox_pure "$@"
diff --git a/bin/n3ds b/bin/n3ds
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher n3ds citra "$@"
diff --git a/bin/n64 b/bin/n64
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher n64 mupen64plus_next "$@"
diff --git a/bin/nds b/bin/nds
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/usr/libexec/chimera/launcher nds desmume "$@"
diff --git a/bin/neo-geo b/bin/neo-geo
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher neo-geo mame "$@"
diff --git a/bin/nes b/bin/nes
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher nes nestopia "$@"
diff --git a/launchers/ngc → bin/ngc b/launchers/ngc → bin/ngc
@@ -3,4 +3,4 @@
 rm -f ~/.local/share/chimera/content/ngc/dolphin-emu/Sys
 mkdir -p ~/.local/share/chimera/content/ngc/dolphin-emu
 ln -s /usr/share/dolphin-emu/sys ~/.local/share/chimera/content/ngc/dolphin-emu/Sys
-/usr/share/chimera/bin/launcher ngc dolphin "$@"
+/usr/libexec/chimera/launcher ngc dolphin "$@"
diff --git a/bin/ps1 b/bin/ps1
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher ps1 mednafen_psx_hw "$@"
diff --git a/launchers/ps2 → bin/ps2 b/launchers/ps2 → bin/ps2
@@ -5,4 +5,4 @@ if [ ! -e ~/.config/retroarch/system/pcsx2 ]; then
 	ln -s ~/.local/share/chimera/content/ps2 ~/.config/retroarch/system/pcsx2/bios
 fi
 
-/usr/share/chimera/bin/launcher ps2 pcsx2 "$@"
+/usr/libexec/chimera/launcher ps2 pcsx2 "$@"
diff --git a/bin/saturn b/bin/saturn
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher saturn kronos "$@"
diff --git a/bin/sega-cd b/bin/sega-cd
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher sega-cd genesis_plus_gx "$@"
diff --git a/bin/sgb b/bin/sgb
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher sgb mesen-s "$@"
diff --git a/bin/sgg b/bin/sgg
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher sgg genesis_plus_gx "$@"
diff --git a/bin/sms b/bin/sms
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher sms genesis_plus_gx "$@"
diff --git a/bin/snes b/bin/snes
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher snes snes9x "$@"
diff --git a/bin/snesmsu1 b/bin/snesmsu1
@@ -0,0 +1,7 @@
+#! /bin/bash
+romname="${@%.zip}"
+mkdir tmp
+fuse-zip -r "$@" tmp
+/usr/libexec/chimera/launcher snesmsu1 snes9x "$HOME/.local/share/chimera/content/snesmsu1/.snesmsu1/tmp/$romname"
+fusermount -u tmp
+rmdir tmp
diff --git a/launchers/spsp → bin/spsp b/launchers/spsp → bin/spsp
@@ -1,4 +1,4 @@
 #! /bin/bash
 
 ln -s /usr/share/libretro/ppsspp/assets ~/.local/share/chimera/content/spsp/PPSSPP
-/usr/share/chimera/bin/launcher spsp ppsspp "$@"
+/usr/libexec/chimera/launcher spsp ppsspp "$@"
diff --git a/steam-patch → bin/steam-patch b/steam-patch → bin/steam-patch
diff --git a/steam-tweaks → bin/steam-tweaks b/steam-tweaks → bin/steam-tweaks
diff --git a/launchers/switch → bin/switch b/launchers/switch → bin/switch
diff --git a/bin/tg-16 b/bin/tg-16
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+/usr/libexec/chimera/launcher tg-16 mednafen_pce_fast "$@"
diff --git a/bin/toggle-steamos-compositor b/bin/toggle-steamos-compositor
diff --git a/launchers/wii → bin/wii b/launchers/wii → bin/wii
@@ -3,4 +3,4 @@
 rm -f ~/.local/share/chimera/content/wii/dolphin-emu/Sys
 mkdir -p ~/.local/share/chimera/content/wii/dolphin-emu
 ln -s /usr/share/dolphin-emu/sys ~/.local/share/chimera/content/wii/dolphin-emu/Sys
-/usr/share/chimera/bin/launcher wii dolphin "$@"
+/usr/libexec/chimera/launcher wii dolphin "$@"
diff --git a/chimera_app/config.py b/chimera_app/config.py
@@ -30,9 +30,9 @@ def merge_single_level(src1, src2):
 if not os.path.isfile(os.path.join(RESOURCE_DIR, 'views/base.tpl')):
     RESOURCE_DIR = "/usr/share/chimera"
 
-BIN_PATH = os.path.abspath('bin')
+BIN_PATH = os.path.abspath('libexec')
 if not os.path.isdir(BIN_PATH):
-    BIN_PATH = "/usr/share/chimera/bin"
+    BIN_PATH = "/usr/libexec/chimera"
 
 BANNER_DIR = context.DATA_HOME + '/chimera/images'
 DATA_DIR = context.DATA_HOME + '/chimera/data'

diff --git a/chimera_app/platforms/flathub.py b/chimera_app/platforms/flathub.py
@@ -3,11 +3,11 @@
 import requests
 from typing import List, Dict
 from chimera_app.platforms.store_platform import StorePlatform, dic
-from chimera_app.config import RESOURCE_DIR, BANNER_DIR
+from chimera_app.config import RESOURCE_DIR, BANNER_DIR, BIN_PATH
 from chimera_app.steam_config import status_to_collection_name
 
 
-FLATPAK_WRAPPER = "bin/flatpak-wrapper"
+FLATPAK_WRAPPER = os.path.join(BIN_PATH, 'flatpak-wrapper')
 
 
 def listdir(path):

diff --git a/chimera_app/platforms/gog.py b/chimera_app/platforms/gog.py
@@ -126,7 +126,7 @@ def _install(self, content) -> subprocess:
         ensure_directory(cachedir)
 
         if not content.native:
-            cmd = ["bin/gog-install",
+            cmd = [os.path.join(BIN_PATH, 'gog-install')
                    content.content_id,
                    os.path.join(CONTENT_DIR, 'gog', content.content_id)]
             return subprocess.Popen(cmd,

diff --git a/chimera_app/server.py b/chimera_app/server.py
@@ -604,15 +604,6 @@ def steam_restart():
         redirect('/actions')
 
 
-@route('/actions/steam/compositor')
-@authenticate
-def steam_compositor():
-    try:
-        subprocess.call(["bin/toggle-steamos-compositor"])
-    finally:
-        redirect('/actions')
-
-
 @route('/emulators/yuzu')
 @authenticate
 def emulators_yuzu():

diff --git a/chimera_app/splash_screen.py b/chimera_app/splash_screen.py
@@ -6,10 +6,9 @@
 
 class SplashScreen:
     def __init__(self):
-        bin_path = BIN_PATH
-        self.__app = os.path.join(bin_path, 'chimera-splash')
-        self.__fg = os.path.join(bin_path, 'gamescope-fg')
+        self.__app = os.path.join(BIN_PATH, 'chimera-splash')
+        self.__fg = os.path.join(BIN_PATH, 'gamescope-fg')
 
     def launch(self) -> None:
         print("Showing splash screen")
-        subprocess.Popen([self.__fg, self.__app])
+        subprocess.Popen([self.__fg, self.__app])
diff --git a/launchers/32x b/launchers/32x
diff --git a/launchers/3do b/launchers/3do
diff --git a/launchers/arcade b/launchers/arcade
diff --git a/launchers/atari-2600 b/launchers/atari-2600
diff --git a/launchers/atari-7800 b/launchers/atari-7800
diff --git a/launchers/dreamcast b/launchers/dreamcast
diff --git a/launchers/gb b/launchers/gb
diff --git a/launchers/gba b/launchers/gba
diff --git a/launchers/gbc b/launchers/gbc
diff --git a/launchers/genesis b/launchers/genesis
diff --git a/launchers/jaguar b/launchers/jaguar
diff --git a/launchers/msdos b/launchers/msdos
diff --git a/launchers/n3ds b/launchers/n3ds
diff --git a/launchers/n64 b/launchers/n64
diff --git a/launchers/nds b/launchers/nds
diff --git a/launchers/neo-geo b/launchers/neo-geo
diff --git a/launchers/nes b/launchers/nes
diff --git a/launchers/ps1 b/launchers/ps1
diff --git a/launchers/saturn b/launchers/saturn
diff --git a/launchers/sega-cd b/launchers/sega-cd
diff --git a/launchers/sgb b/launchers/sgb
diff --git a/launchers/sgg b/launchers/sgg
diff --git a/launchers/sms b/launchers/sms
diff --git a/launchers/snes b/launchers/snes
diff --git a/launchers/snesmsu1 b/launchers/snesmsu1
diff --git a/launchers/tg-16 b/launchers/tg-16
diff --git a/bin/chimera-authenticator → libexec/chimera-authenticator b/bin/chimera-authenticator → libexec/chimera-authenticator
diff --git a/bin/chimera-cart-monitor → libexec/chimera-cart-monitor b/bin/chimera-cart-monitor → libexec/chimera-cart-monitor
diff --git a/bin/chimera-splash → libexec/chimera-splash b/bin/chimera-splash → libexec/chimera-splash
diff --git a/bin/chimera-web-launcher → libexec/chimera-web-launcher b/bin/chimera-web-launcher → libexec/chimera-web-launcher
diff --git a/bin/flatpak-wrapper → libexec/flatpak-wrapper b/bin/flatpak-wrapper → libexec/flatpak-wrapper
diff --git a/bin/gamescope-fg → libexec/gamescope-fg b/bin/gamescope-fg → libexec/gamescope-fg
diff --git a/bin/gog-install → libexec/gog-install b/bin/gog-install → libexec/gog-install
diff --git a/bin/launcher → libexec/launcher b/bin/launcher → libexec/launcher
diff --git a/bin/power-tool → libexec/power-tool b/bin/power-tool → libexec/power-tool
diff --git a/bin/system-info → libexec/system-info b/bin/system-info → libexec/system-info
diff --git a/org.chimeraos.app.desktop b/org.chimeraos.app.desktop
@@ -4,5 +4,5 @@ Version=1.0
 Terminal=false
 Type=Application
 Name=Chimera
-Exec=/usr/share/chimera/bin/chimera-web-launcher
+Exec=/usr/libexec/chimera/chimera-web-launcher
 Icon=/usr/share/chimera/images/chimera-logo.png
diff --git a/setup.py b/setup.py
@@ -9,11 +9,11 @@
     entry_points={
         'console_scripts': ['chimera = chimera_app.__main__:main']
                   },
-    scripts=['steam-tweaks',
-             'steam-patch',
-             ],
-
     data_files=[
+        ('bin', glob('bin/*')),
+        ('lib/systemd/system', glob('systemd/system/*')),
+        ('lib/systemd/user', glob('systemd/user/*')),
+        ('libexec/chimera', glob('libexec/*')),
         ('share/chimera/images', glob('images/*.png')),
         ('share/chimera/images/flathub', glob('images/flathub/*.png')),
         ('share/chimera/images/splash', glob('images/splash/*.png')),
@@ -25,9 +25,7 @@
         ('share/chimera/public', glob('public/*.webp')),
         ('share/chimera/config', glob('config/*.cfg')),
         ('share/chimera/config', glob('config/*.conf')),
-        ('share/chimera/bin',    glob('bin/*')),
         ('share/chimera/migrations', glob('migrations/*')),
-        ('bin', glob('launchers/*')),
         ('share/doc/chimera', ['README.md']),
         ('share/doc/chimera', ['LICENSE']),
         ('share/applications', ['org.chimeraos.app.desktop']),

diff --git a/chimera-proxy.service → systemd/system/chimera-proxy.service b/chimera-proxy.service → systemd/system/chimera-proxy.service
diff --git a/chimera-proxy.socket → systemd/system/chimera-proxy.socket b/chimera-proxy.socket → systemd/system/chimera-proxy.socket
diff --git a/chimera-cart-monitor.service → systemd/user/chimera-cart-monitor.service b/chimera-cart-monitor.service → systemd/user/chimera-cart-monitor.service
@@ -4,7 +4,7 @@ Requires=dev-gboperator.device
 After=dev-gboperator.device
 
 [Service]
-ExecStart=/usr/share/chimera/bin/chimera-cart-monitor
+ExecStart=/usr/libexec/chimera/chimera-cart-monitor
 Restart=always
 
 [Install]

diff --git a/chimera.service → systemd/user/chimera.service b/chimera.service → systemd/user/chimera.service
diff --git a/steam-patch.service → systemd/user/steam-patch.service b/steam-patch.service → systemd/user/steam-patch.service
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#! /bin/bash

		/usr/libexec/chimera/launcher 32x picodrive "$@"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#! /bin/bash

		/usr/libexec/chimera/launcher 3do opera "$@"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#! /bin/bash

		/usr/libexec/chimera/launcher arcade mame "$@"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#! /bin/bash

		/usr/libexec/chimera/launcher atari-2600 stella2014 "$@"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#! /bin/bash

		/usr/libexec/chimera/launcher atari-7800 prosystem "$@"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#! /bin/bash

		/usr/libexec/chimera/launcher dreamcast flycast "$@"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#! /bin/bash

		/usr/libexec/chimera/launcher gb mgba "$@"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#! /bin/bash

		/usr/libexec/chimera/launcher gba mgba "$@"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#! /bin/bash

		/usr/libexec/chimera/launcher gbc mgba "$@"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#! /bin/bash

		/usr/libexec/chimera/launcher genesis genesis_plus_gx "$@"