Merge branch 'dev' into early-unstable

src/renderer/App.tsx

@@ -143,7 +143,7 @@ export default function App() {
     cloudSync: undefined,
     cloudSyncType: 'Sync',
     cloudSyncStatus: false,
-    sudoPass: 'Decky!',
+    sudoPass: 'EmuDecky!',
     language: 'en',
     android: {
       bezels: true,

src/renderer/pages/DeckyRomLauncherInstallPage.jsx

@@ -18,7 +18,7 @@ function DeckyRomLauncherInstallPage() {
     disabledBack: false,
     data: '',
     hasSudo: false,
-    sudoPass: 'Decky!',
+    sudoPass: 'EmuDecky!',
     modal: false,
     pass1: 'a',
     pass2: 'b',
@@ -46,7 +46,7 @@ function DeckyRomLauncherInstallPage() {
     } else {
       setStatePage({
         ...statePage,
-        sudoPass: 'Decky!',
+        sudoPass: 'EmuDecky!',
       });
     }
   };
@@ -101,7 +101,7 @@ function DeckyRomLauncherInstallPage() {
     });
     const escapedPass = sudoPass.replaceAll("'", "'\\''");
     ipcChannel.sendMessage('emudeck', [
-      `DeckyRomLibrary|||Plugins_installPluginLoader "${escapedPass}" && Plugins_installDeckyRomLibrary "${escapedPass}" && echo true`,
+      `DeckyRomLibrary|||Plugins_installDeckyRomLibrary "${escapedPass}" && echo true`,
     ]);
 
     ipcChannel.once('DeckyRomLibrary', (status) => {

src/renderer/pages/DeckyRomLauncherPage.jsx

@@ -11,12 +11,16 @@ import DeckyRomLauncher from 'components/organisms/Wrappers/DeckyRomLauncher';
 
 function DeckyRomLauncherPage() {
   const { t, i18n } = useTranslation();
+
+  const { state, setState } = useContext(GlobalContext);
+  const { system } = state;
+
   const [statePage, setStatePage] = useState({
     disabledNext: false,
     disabledBack: false,
     data: '',
     hasSudo: false,
-    sudoPass: 'Decky!',
+    sudoPass: 'EmuDecky!',
     modal: false,
     pass1: 'a',
     pass2: 'b',
@@ -44,7 +48,7 @@ function DeckyRomLauncherPage() {
     } else {
       setStatePage({
         ...statePage,
-        sudoPass: 'Decky!',
+        sudoPass: 'EmuDecky!',
       });
     }
   };
@@ -99,7 +103,7 @@ function DeckyRomLauncherPage() {
     });
     const escapedPass = sudoPass.replaceAll("'", "'\\''");
     ipcChannel.sendMessage('emudeck', [
-      `DeckyRomLibrary|||Plugins_installPluginLoader "${escapedPass}" && Plugins_installDeckyRomLibrary "${escapedPass}" && echo true`,
+      `DeckyRomLibrary|||Plugins_installDeckyRomLibrary "${escapedPass}" && echo true`,
     ]);
 
     ipcChannel.once('DeckyRomLibrary', (status) => {

src/renderer/pages/EmuDeckyPage.jsx

@@ -16,7 +16,7 @@ function EmuDeckyPage() {
     disabledBack: false,
     data: '',
     hasSudo: false,
-    sudoPass: 'Decky!',
+    sudoPass: 'EmuDecky!',
     modal: false,
     pass1: 'a',
     pass2: 'b',
@@ -44,7 +44,7 @@ function EmuDeckyPage() {
     } else {
       setStatePage({
         ...statePage,
-        sudoPass: 'Decky!',
+        sudoPass: 'EmuDecky!',
       });
     }
   };
@@ -99,12 +99,13 @@ function EmuDeckyPage() {
     });
     const escapedPass = sudoPass.replaceAll("'", "'\\''");
     ipcChannel.sendMessage('emudeck', [
-      `EmuDecky|||Plugins_installPluginLoader "${escapedPass}" && Plugins_installEmuDecky "${escapedPass}" && echo true`,
+      `EmuDecky|||Plugins_installEmuDecky "${escapedPass}" || echo true`,
     ]);
 
     ipcChannel.once('EmuDecky', (status) => {
       const { stdout } = status;
       let modalData;
+      console.log({ status });
       if (stdout.includes('true')) {
         modalData = {
           active: true,

src/renderer/pages/GyroDSUPage.jsx

@@ -17,7 +17,7 @@ function GyroDSUPage() {
     disabledBack: false,
     data: '',
     hasSudo: false,
-    sudoPass: 'Decky!',
+    sudoPass: 'EmuDecky!',
     pass1: 'a',
     pass2: 'b',
     modal: false,

src/renderer/pages/PowerControlsPage.jsx

@@ -1,5 +1,6 @@
 import { useTranslation } from 'react-i18next';
-import React, { useEffect, useState, useRef } from 'react';
+import React, { useEffect, useState, useContext } from 'react';
+import { GlobalContext } from 'context/globalContext';
 import Wrapper from 'components/molecules/Wrapper/Wrapper';
 
 import Header from 'components/organisms/Header/Header';
@@ -10,12 +11,16 @@ import PowerControls from 'components/organisms/Wrappers/PowerControls';
 
 function PowerControlsPage() {
   const { t, i18n } = useTranslation();
+
+  const { state, setState } = useContext(GlobalContext);
+  const { system } = state;
+
   const [statePage, setStatePage] = useState({
     disabledNext: false,
     disabledBack: false,
     data: '',
     hasSudo: false,
-    sudoPass: 'Decky!',
+    sudoPass: 'EmuDecky!',
     disableButton: false,
     pass1: 'a',
     pass2: 'b',
@@ -44,7 +49,7 @@ function PowerControlsPage() {
     } else {
       setStatePage({
         ...statePage,
-        sudoPass: system === 'chimeraos' ? 'gamer' : 'Decky!',
+        sudoPass: system === 'chimeraos' ? 'gamer' : 'EmuDecky!',
       });
     }
   };
@@ -100,7 +105,7 @@ function PowerControlsPage() {
     const escapedPass = sudoPass.replaceAll("'", "'\\''");
 
     ipcChannel.sendMessage('emudeck', [
-      `powerControls|||Plugins_installPluginLoader ${escapedPass} && Plugins_installPowerControls ${escapedPass} && echo true`,
+      `powerControls|||Plugins_installPowerControls ${escapedPass} && echo true`,
     ]);
 
     ipcChannel.once('powerControls', (status) => {

src/renderer/pages/PowerToolsPage.jsx

@@ -1,5 +1,6 @@
 import { useTranslation } from 'react-i18next';
-import React, { useEffect, useState, useRef } from 'react';
+import { GlobalContext } from 'context/globalContext';
+import React, { useEffect, useState, useContext } from 'react';
 import Wrapper from 'components/molecules/Wrapper/Wrapper';
 
 import Header from 'components/organisms/Header/Header';
@@ -10,12 +11,16 @@ import PowerTools from 'components/organisms/Wrappers/PowerTools';
 
 function PowerToolsPage() {
   const { t, i18n } = useTranslation();
+
+  const { state, setState } = useContext(GlobalContext);
+  const { system } = state;
+
   const [statePage, setStatePage] = useState({
     disabledNext: false,
     disabledBack: false,
     data: '',
     hasSudo: false,
-    sudoPass: 'Decky!',
+    sudoPass: 'EmuDecky!',
     disableButton: false,
     pass1: 'a',
     pass2: 'b',
@@ -44,7 +49,7 @@ function PowerToolsPage() {
     } else {
       setStatePage({
         ...statePage,
-        sudoPass: system === 'chimeraos' ? 'gamer' : 'Decky!',
+        sudoPass: system === 'chimeraos' ? 'gamer' : 'EmuDecky!',
       });
     }
   };
@@ -100,7 +105,7 @@ function PowerToolsPage() {
     const escapedPass = sudoPass.replaceAll("'", "'\\''");
 
     ipcChannel.sendMessage('emudeck', [
-      `powerTools|||Plugins_installPluginLoader ${escapedPass} && Plugins_installPowerTools ${escapedPass} && echo true`,
+      `powerTools|||Plugins_installPowerTools ${escapedPass} && echo true`,
     ]);
 
     ipcChannel.once('powerTools', (status) => {