move installer in modfs to top

Author: DerGoogler

Website/src/activitys/MainApplication.tsx

@@ -52,8 +52,6 @@ const MainApplication = () => {
     }
   }, [modules]);
 
-  const hasInstallTools = SuFile.exist(`${modFS("MMRLINI")}/module.prop`);
-
   const renderTabs = (): TabbarRenderTab[] => {
     return [
       {
@@ -72,7 +70,7 @@ const MainApplication = () => {
                   modules={localModules}
                   renderItem={(module, key) => <DeviceModule key={key} module={module} />}
                   renderFixed={() => {
-                    if (os.isAndroid && (Shell.isMagiskSU() || Shell.isKernelSU() || Shell.isAPatchSU()) && hasInstallTools) {
+                    if (os.isAndroid && (Shell.isMagiskSU() || Shell.isKernelSU() || Shell.isAPatchSU())) {
                       return (
                         <Fab
                           sx={{

Website/src/activitys/ModFSActivity.tsx

@@ -48,6 +48,49 @@ function ModFSActivity() {
 
   const items: ModFSSections[] = React.useMemo<ModFSSections[]>(
     () => [
+      {
+        sectionText: "Installer",
+        items: [
+          {
+            text: "Explore install script",
+            multiline: true,
+            maxRows: 10,
+            dialogDesc: (
+              <>
+                <Typography>
+                  Check the{" "}
+                  <Anchor href="https://github.com/DerGoogler/MMRL/tree/master/docs" noIcon>
+                    ModFS documentations
+                  </Anchor>{" "}
+                  for more informations!
+                  <br />
+                  <code>{"<URL>"}</code> and <code>{"<MODID>"}</code> can also be used, shell supported.
+                </Typography>
+              </>
+            ),
+            confKey: "EXPLORE_INSTALL",
+          },
+          {
+            text: "Local install script",
+            multiline: true,
+            maxRows: 10,
+            dialogDesc: (
+              <>
+                <Typography>
+                  Check the{" "}
+                  <Anchor href="https://github.com/DerGoogler/MMRL/tree/master/docs" noIcon>
+                    ModFS documentations
+                  </Anchor>{" "}
+                  for more informations!
+                  <br />
+                  <code>{"<ZIPFILE>"}</code> can also be used, shell supported.
+                </Typography>
+              </>
+            ),
+            confKey: "LOCAL_INSTALL",
+          },
+        ],
+      },
       {
         sectionText: "Command line interfaces",
         items: [
@@ -214,53 +257,6 @@ function ModFSActivity() {
           },
         ],
       },
-      {
-        sectionText: "Others",
-        items: [
-          {
-            text: "MMRL Install Tools",
-            confKey: "MMRLINI",
-          },
-          {
-            text: "Explore install script",
-            multiline: true,
-            maxRows: 10,
-            dialogDesc: (
-              <>
-                <Typography>
-                  Check the{" "}
-                  <Anchor href="https://github.com/DerGoogler/MMRL/tree/master/docs" noIcon>
-                    ModFS documentations
-                  </Anchor>{" "}
-                  for more informations!
-                  <br />
-                  <code>{"<URL>"}</code> and <code>{"<MODID>"}</code> can also be used, shell supported.
-                </Typography>
-              </>
-            ),
-            confKey: "EXPLORE_INSTALL",
-          },
-          {
-            text: "Local install script",
-            multiline: true,
-            maxRows: 10,
-            dialogDesc: (
-              <>
-                <Typography>
-                  Check the{" "}
-                  <Anchor href="https://github.com/DerGoogler/MMRL/tree/master/docs" noIcon>
-                    ModFS documentations
-                  </Anchor>{" "}
-                  for more informations!
-                  <br />
-                  <code>{"<ZIPFILE>"}</code> can also be used, shell supported.
-                </Typography>
-              </>
-            ),
-            confKey: "LOCAL_INSTALL",
-          },
-        ],
-      },
     ],
     []
   );

Website/src/activitys/ModuleViewActivity/index.tsx

@@ -124,9 +124,7 @@ const ModuleViewActivity = () => {
     );
   };
 
-  const { modFS } = useModFS();
   const [isNameVisible, setIsNameVisible] = React.useState(true);
-  const hasInstallTools = SuFile.exist(`${modFS("MMRLINI")}/module.prop`);
 
   const boxRef = React.useRef<HTMLDivElement | null>(null);
   const [value, setValue] = React.useState(0);
@@ -328,12 +326,8 @@ const ModuleViewActivity = () => {
                 )}
               </Stack>
 
-              {/* <Typography sx={{ display: "flex", justifyContent: "flex-start", alignItems: "center" }} color="text.secondary">
-                ({versionCode})
-              </Typography> */}
-
               <Stack direction="row" justifyContent="center" alignItems="center" spacing={1}>
-                {os.isAndroid && (Shell.isMagiskSU() || Shell.isKernelSU() || Shell.isAPatchSU()) && hasInstallTools && (
+                {os.isAndroid && (Shell.isMagiskSU() || Shell.isKernelSU() || Shell.isAPatchSU()) && (
                   <Button
                     color="secondary"
                     sx={{

Website/src/hooks/useModFS.tsx

@@ -44,8 +44,7 @@ export interface ModFS {
   MODCONF_PLAYGROUND: string;
   MODCONF_PLAYGROUND_MODID: string;
 
-  // others
-  MMRLINI: string;
+  // Installer
   EXPLORE_INSTALL: string;
   LOCAL_INSTALL: string;
 }
@@ -89,10 +88,9 @@ export const INITIAL_MOD_CONF: ModFS = {
   MODCONF_PLAYGROUND: "<ADB>/mmrl/modconf-playground.jsx",
   MODCONF_PLAYGROUND_MODID: "playground",
 
-  // others
-  MMRLINI: "<MODULES>/mmrl_install_tools",
-  EXPLORE_INSTALL: "sh <MMRLINI>/system/usr/share/mmrl/bin/mmrl_explore_install_v8.sh",
-  LOCAL_INSTALL: "sh <MMRLINI>/system/usr/share/mmrl/bin/mmrl_local_install_v8.sh",
+  // Installer
+  EXPLORE_INSTALL: 'mmrl install -y "<URL>"',
+  LOCAL_INSTALL: 'mmrl install local -y "<ZIPFILE>"',
 };
 
 export interface ModConfContext {
@@ -116,7 +114,7 @@ export const useModFS = () => {
 };
 
 export const ModFSProvider = (props: React.PropsWithChildren) => {
-  const [modFS, setModFS] = useNativeFileStorage("/data/adb/mmrl/modfs.v7.json", INITIAL_MOD_CONF, { loader: "json" });
+  const [modFS, setModFS] = useNativeFileStorage("/data/adb/mmrl/modfs.v8.json", INITIAL_MOD_CONF, { loader: "json" });
 
   const contextValue = React.useMemo(
     () => ({