da correggere su manjaro

pieroproietti · Dec 27, 2024 · 6c43cab · 6c43cab
1 parent 96623ac
commit 6c43cab
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/src/classes/distro.ts b/src/classes/distro.ts
@@ -71,11 +71,11 @@ class Distro implements IDistro {
     }
 
     if (this.distroId.includes('Biglinux')) {
-      this.distroId = "BigLinux"
+      this.distroId = "Biglinux"
     }
 
-    if (this.distroId.includes('BigCommunity')) {
-      this.distroId = "BigCommunity"
+    if (this.distroId.includes('Bigcommunity')) {
+      this.distroId = "Bigcommunity"
     }
 
 
@@ -334,7 +334,7 @@ class Distro implements IDistro {
     }
 
     /**
-     * ManjaroLinux e derivate
+     * Manjarolinux e derivate
      */
     if (Diversions.isManjaroBased(this.distroId)) {
       this.liveMediumPath = '/run/miso/bootmnt/'

diff --git a/src/classes/diversions.ts b/src/classes/diversions.ts
@@ -131,9 +131,9 @@ export default class Diversions {
   */
   static isManjaroBased(distro: string): boolean {
     let found = false
-    if (distro === 'ManjaroLinux' ||
-      distro === `BigLinux` ||
-      distro === `BigCommunity`) {
+    if (distro === 'Manjarolinux' ||
+      distro === `Biglinux` ||
+      distro === `Bigcommunity`) {
       found = true
     }
 

diff --git a/src/classes/ovary.ts b/src/classes/ovary.ts
@@ -389,9 +389,9 @@ export default class Ovary {
     let installerLink = 'install-system.desktop'
     if (Pacman.calamaresExists()) {
       /**
-       * Replace Exec in install-system.desktop per biglinux e bigcommunity
+       * Replace Exec in install-system.desktop per Biglinux e Bigcommunity
        */
-      if (this.settings.distro.distroId === 'BigLinux' || this.settings.distro.distroId === 'BigCommunity') {
+      if (this.settings.distro.distroId === 'Biglinux' || this.settings.distro.distroId === 'Bigcommunity') {
         let installSystemDesktop = path.resolve(__dirname, `../../addons/${theme}/theme/applications/install-system.desktop`)
         await exec(`sed -i 's|^Exec=.*|Exec=/usr/bin/calamares_polkit %f|' ${installSystemDesktop}`)
       }
@@ -906,9 +906,9 @@ export default class Ovary {
     const { distroId } = this.settings.distro
     let fileConf = 'arch'
     if (Diversions.isManjaroBased(distroId)) {
-      fileConf = 'manjarolinux'
-      if (distroId === "BigLinux" || distroId === "BigCommunity") {
-        fileConf = 'biglinux'
+      fileConf = 'Manjarolinux'
+      if (distroId === "Biglinux" || distroId === "Bigcommunity") {
+        fileConf = 'Biglinux'
       }
     }
 

diff --git a/src/classes/pxe.ts b/src/classes/pxe.ts
@@ -63,7 +63,7 @@ export default class Pxe {
     await this.tryCatch(`ln -s ${this.eggRoot}live ${this.pxeRoot}/live`)
     await this.tryCatch(`ln -s ${this.nest}.disk ${this.pxeRoot}/.disk`)
 
-    if (this.settings.distro.distroId === 'ManjaroLinux') {
+    if (this.settings.distro.distroId === 'Manjarolinux') {
       await this.tryCatch(`ln -s ${this.eggRoot}manjaro ${this.pxeRoot}/manjaro`)
     } else if (this.settings.distro.distroId === 'Arch' || this.settings.distro.distroId === 'RebornOS') {
       await this.tryCatch(`ln -s ${this.eggRoot}arch ${this.pxeRoot}/arch`)
@@ -303,7 +303,7 @@ export default class Pxe {
        * ARCH LINUX
        */
       let tool = 'archiso'
-      if (distro.distroId === 'ManjaroLinux') {
+      if (distro.distroId === 'Manjarolinux') {
         tool = 'miso'
       }
 

diff --git a/src/classes/utils.tsx b/src/classes/utils.tsx
@@ -701,7 +701,7 @@ export default class Utils {
          '/live/aufs',  // mx-linux
          '/media/root-rw', // AlpineLinux
          '/run/archiso/airootfs', // Arch
-         '/run/miso/sfs/livefs', // ManjaroLinux
+         '/run/miso/sfs/livefs', // Manjarolinux
          '/run/rootfsbase' // Fedora
       ]
 

diff --git a/src/commands/tools/ppa.ts b/src/commands/tools/ppa.ts
@@ -72,7 +72,7 @@ export default class Ppa extends Command {
 
       if (distro.familyId === 'archlinux') {
         if (flags.add) {
-          if (distro.distroId !== 'ManjaroLinux') {
+          if (distro.distroId !== 'Manjarolinux') {
             Utils.warning(`Are you sure to add chaotic-aur to your repositories?`)
             if (await Utils.customConfirm('Select yes to continue...')) {
               await archAdd()

diff --git a/src/krill/sequence.tsx b/src/krill/sequence.tsx
@@ -257,7 +257,7 @@ export default class Sequence {
        * To let krill to work with Arch we need:
        */
       if (this.distro.familyId === 'archlinux') {
-         if (this.distro.distroId === 'ManjaroLinux') {
+         if (this.distro.distroId === 'Manjarolinux') {
             await exec(`ln -s /run/miso/bootmnt/live/ /live`)
          } else {
             await exec(`ln -s /run/archiso/bootmnt/live/ /live`)