Merge pull request #62 from nevernever69/dev

Added support for Arch

CMakeLists.txt

@@ -0,0 +1,48 @@
+cmake_minimum_required(VERSION 3.0)
+project(RunScript)
+
+if(UNIX AND NOT APPLE)
+  file(READ "/etc/os-release" OS_RELEASE)
+
+  string(REGEX MATCH "ID=([A-Za-z]*)" LINUX_ID_MATCH "${OS_RELEASE}")
+  set(LINUX_ID "${CMAKE_MATCH_1}")
+
+  if(NOT LINUX_ID)
+    string(REGEX MATCH "ID_LIKE=([A-Za-z]*)" LINUX_ID_LIKE_MATCH "${OS_RELEASE}")
+    set(LINUX_ID "${CMAKE_MATCH_1}")
+  endif()
+
+  if(LINUX_ID STREQUAL "")
+    message(WARNING "Could not identify Linux distribution. Adapting as much as possible.")
+    set(DISTRO "Unknown Linux Distribution")
+  else()
+    if(LINUX_ID STREQUAL "arch")
+      message(STATUS "Detected Arch Linux")
+      set(DISTRO "Arch Linux")
+      add_custom_target(run_script
+	      COMMAND  sudo pacman -S --needed  base-devel  curl wget  file openssl  gtk3 patchelf libappindicator-gtk3  librsvg -y  webkit2gtk 
+	      COMMENT "Running script on Arch Linux"
+      )
+    elseif(LINUX_ID STREQUAL "debian")
+      message(STATUS "Detected Debian Linux")
+      set(DISTRO "Debian Linux")
+	      add_custom_target(run_script
+	      COMMAND   sudo apt-get install libwebkit2gtk-4.0-dev build-essential  curl wget file  libssl-dev  libgtk-3-dev  patchelf  libappindicator3-dev  librsvg2-dev -y
+	      COMMENT "Running script on Debian Linux"
+      )
+
+    else()
+      message(STATUS "Detected ${LINUX_ID}-like Linux distribution")
+      set(DISTRO "${LINUX_ID}-like Linux")
+      add_custom_target(run_script
+	      COMMAND   sudo apt-get install libwebkit2gtk-4.0-dev build-essential  curl wget file  libssl-dev  libgtk-3-dev  patchelf  libappindicator3-dev  librsvg2-dev -y
+	      COMMENT "Running script on Debian Linux"
+	      )
+
+    endif()
+  endif()
+
+
+else()
+  message(FATAL_ERROR "This CMake script is designed for Linux systems only.")
+endif()

Makefile

@@ -0,0 +1,8 @@
+all: build run
+build:
+	cmake -Bbuild
+	cmake --build build/
+
+
+clean:
+	rm -rf build/

src-tauri/src/commands/general.rs

@@ -66,7 +66,7 @@ pub async fn get_distro() -> Result<String, rspc::Error> {
         "cat",
         false,
         true,
-        vec!["/etc/lsb-release"],
+        vec!["/etc/*-release"],
     )
     .exec(None)
     {

src/components/Home/Home.tsx

@@ -1,18 +1,21 @@
 import { ScrollArea } from "../ui/scroll-area";
 import General from "./General";
 import AllServices from "./Services";
-import Ubuntu from "./UbuntuBranding";
+import Ubuntu from './UbuntuBranding.tsx'
 import Update from "./Update";
-
+import {useContext} from 'react';
+import {DistroContext} from '../context/Distro.jsx'
 export default function Home() {
+  const distrocontext = useContext(DistroContext);
+  const imageSrc = distrocontext.distro === "arch" ? "/arch.png" : "/ubuntu.png";
   return (
     <div className="flex gap-2 xl:gap-4 h-[84vh]">
       <div className="w-1/3 flex flex-col gap-2 xl:gap-4">
         <div className="h-24 xl:h-36 border rounded shadow p-1 xl:p-2 flex items-center justify-center">
           <div className="flex gap-2 xl:gap-4 items-center">
             <img
-              src="/ubuntu.png"
-              alt="Ubuntu Desktop Logo"
+              src={imageSrc}
+              alt=  {distrocontext.distro + "Desktop Logo"}
               className="h-14 xl:h-24 w-14 xl:w-24"
             />
             <Ubuntu />

src/components/Home/UbuntuBranding.tsx

@@ -1,4 +1,6 @@
 import { rspc } from "@/context/rspc";
+import React, {useContext} from 'react';
+import {DistroContext} from "../context/Distro.jsx";
 
 // This will collect information about the distro
 // The data will be like this
@@ -7,6 +9,7 @@ import { rspc } from "@/context/rspc";
 // DISTRIB_CODENAME=jammy
 // DISTRIB_DESCRIPTION="Ubuntu 22.04.3 LTS"
 export default function Ubuntu() {
+const distrocontext = useContext(DistroContext);
   const { data, isLoading, error } = rspc.useQuery(["get_distro"]);
 
   if (error) {
@@ -18,13 +21,16 @@ export default function Ubuntu() {
   }
 
   const info = data.split("\n");
-  const release = info[2].replace("DISTRIB_CODENAME=", "");
-  const distro = info[3].replace('DISTRIB_DESCRIPTION="', "").replace('"', "");
+  const release = info[2].replace(/PRETTY_NAME=("|')(.*?)\1|DISTRIB_CODENAME=("|')(.*?)\3/g, "$2$4");
+  const distro_name = info[3].replace('DISTRIB_DESCRIPTION="', "").replace('"', "").replace("ID=", "");
+  distrocontext.setDistro(distro_name);
+
 
   return (
     <div className="flex flex-col">
       <span className="text-purple-800 font-semibold">{release}</span>
-      <span className="font-bold text-md xl:text-xl">{distro}</span>
+      <span className="font-bold text-md xl:text-xl">{distro_name}</span>
     </div>
   );
 }
+

src/components/context/Distro.jsx

@@ -0,0 +1,13 @@
+import {createContext, useState} from 'react';
+export const  DistroContext = createContext(null);
+export const  DistroProvider = (props) => {
+	const [distro, setDistro] = useState('Ubuntu');
+	return(
+		<DistroContext.Provider value={{distro, setDistro}}>
+		{props.children}
+		</DistroContext.Provider>
+
+	)
+}
+
+

src/main.tsx

@@ -11,6 +11,7 @@ import TOR from "./components/TOR";
 import Settings from "./components/Settings";
 import Help from "./components/Help";
 import Firewall from "./components/Firewall";
+import {DistroProvider} from './components/context/Distro.jsx'
 
 const router = createBrowserRouter([
   {
@@ -39,8 +40,10 @@ document.addEventListener("DOMContentLoaded", () => {
 
 ReactDom.createRoot(document.getElementById("root") as HTMLElement).render(
   <React.StrictMode>
+    <DistroProvider>
     <RspcProvider>
       <RouterProvider router={router} />
     </RspcProvider>
+      </DistroProvider>
   </React.StrictMode>,
 );