rimosse compretamente dipendenze da pxelinux ed isolinux

pieroproietti · Oct 21, 2024 · 77b7a72 · 77b7a72
1 parent 91bd8bf
commit 77b7a72
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 76 deletions.
diff --git a/DOCS/WAY-TO-DEBIAN.md b/DOCS/WAY-TO-DEBIAN.md
@@ -78,7 +78,6 @@ sudo apt install \
   dosfstools \
   dpkg-dev \
   git \
-  isolinux \
   jq \
   live-boot \
   live-boot-doc \

diff --git a/PREREQUISITES/debian/install.sh b/PREREQUISITES/debian/install.sh
@@ -21,7 +21,6 @@ apt-get install -y \
     dpkg-dev \
     git \
     grub-efi-amd64-bin \
-    isolinux \
     jq \
     live-boot \
     live-boot-doc \
@@ -33,7 +32,6 @@ apt-get install -y \
     nodejs \
     npm \
     parted \
-    pxelinux \
     rsync \
     squashfs-tools \
     sshfs \

diff --git a/PREREQUISITES/devuan/install.sh b/PREREQUISITES/devuan/install.sh
@@ -21,7 +21,6 @@ apt-get install -y \
     dpkg-dev \
     git \
     grub-efi-amd64-bin \
-    isolinux \
     jq \
     live-boot \
     live-boot-doc \
@@ -33,7 +32,6 @@ apt-get install -y \
     nodejs \
     npm \
     parted \
-    pxelinux \
     rsync \
     squashfs-tools \
     sshfs \

diff --git a/PREREQUISITES/ubuntu/install.sh b/PREREQUISITES/ubuntu/install.sh
@@ -20,7 +20,6 @@ apt-get install -y \
     dosfstools \
     dpkg-dev \
     git \
-    isolinux \
     jq \
     live-boot \
     live-boot-doc \
@@ -32,7 +31,6 @@ apt-get install -y \
     nodejs \
     npm \
     parted \
-    pxelinux \
     rsync \
     squashfs-tools \
     sshfs \

diff --git a/install-eggs-dev b/install-eggs-dev
@@ -28,7 +28,7 @@ fi
 # build
 pnpm build
 xdg-user-dirs-update --force
-$SUDO cp scripts/eggs.bash /etc/bash_completion.d/eggs
+$SUDO cp scripts/eggs.bash /usr/share/bash-completion/completions/
 $SUDO cp g4/* /usr/local/bin
 $SUDO cp assets/eggs.png /usr/share/icons/
 $SUDO mkdir -p /usr/share/man/man1

diff --git a/perrisbrewery/template/dependencies-bionic.yaml b/perrisbrewery/template/dependencies-bionic.yaml
@@ -9,7 +9,6 @@ common:
   - dosfstools # eggs
   - dpkg-dev  # yolk
   - git # wardrobe
-  - isolinux # eggs
   - jq # mom
   - live-boot # eggs
   - live-boot-doc # eggs
@@ -20,7 +19,6 @@ common:
   - nodejs (>= 16)
   - live-boot # questo va reinstallato
   - parted 
-  - pxelinux # cuckoo
   - rsync
   - squashfs-tools
   - sshfs # eggs

diff --git a/perrisbrewery/template/dependencies.yaml b/perrisbrewery/template/dependencies.yaml
@@ -9,7 +9,6 @@ common:
   - dosfstools # eggs
   - dpkg-dev  # yolk
   - git # wardrobe
-  - isolinux # eggs
   - jq # mom
   - live-boot # eggs
   - live-boot-doc # eggs
@@ -20,7 +19,6 @@ common:
   - lvm2  # pvdisplay in krill
   - nodejs (>= 18)
   - parted 
-  - pxelinux # cuckoo
   - rsync
   - squashfs-tools
   - sshfs # eggs

diff --git a/src/classes/n8.ts b/src/classes/n8.ts
diff --git a/src/classes/ovary.ts b/src/classes/ovary.ts
@@ -26,7 +26,6 @@ import Bleach from './bleach.js'
 import CliAutologin from './cli-autologin.js'
 import { displaymanager } from './incubation/fisherman-helper/displaymanager.js'
 import Incubator from './incubation/incubator.js'
-import N8 from './n8.js'
 import Pacman from './pacman.js'
 import PveLive from './pve-live.js'
 import Settings from './settings.js'
@@ -129,7 +128,7 @@ export default class Ovary {
 
     for (const dir of dirs) {
       cmds.push(startLine)
-      if (N8.isDirectory(dir)) {
+      if (fs.statSync(`/${dir}`).isDirectory()) {
         if (dir === 'boot') {
           cmds.push(`# /boot is copied actually`)
           cmds.push(await rexec(`cp -r /boot ${this.settings.config.snapshot_mnt}filesystem.squashfs`, this.verbose))
@@ -165,14 +164,14 @@ export default class Ovary {
             cmds.push(await makeIfNotExist(`${this.settings.work_dir.merged}/${dir}`, this.verbose), `# mount -o bind /${dir} ${this.settings.work_dir.merged}/${dir}`)
           }
         }
-      } else if (N8.isFile(dir)) {
+      } else if (fs.statSync(`/${dir}`).isFile()) {
         cmds.push(`# /${dir} is just a file`, titleLine)
         if (fs.existsSync(`${this.settings.work_dir.merged}/${dir}`)) {
           cmds.push('# file exist... skip')
         } else {
           cmds.push(await rexec(`cp /${dir} ${this.settings.work_dir.merged}`, this.verbose))
         }
-      } else if (N8.isSymbolicLink(dir)) {
+      } else if (fs.statSync(`/${dir}`).isSymbolicLink()) {
         lnkDest = fs.readlinkSync(`/${dir}`)
         cmds.push(
           `# /${dir} is a symbolic link to /${lnkDest} in the system`,
@@ -1909,10 +1908,9 @@ export default class Ovary {
       })
 
       for (const dir of bindDirs) {
-        const dirname = N8.dirent2string(dir)
-
+        const dirname = dir.name
         cmds.push('#############################################################')
-        if (N8.isDirectory(dirname)) {
+        if (fs.statSync(`/${dirname}`).isDirectory()) {
           cmds.push(`\n# directory: ${dirname}`)
           if (this.mergedAndOverlay(dirname)) {
             cmds.push(`\n# ${dirname} has overlay`, `\n# First, umount it from ${this.settings.config.snapshot_dir}`)
@@ -1932,10 +1930,10 @@ export default class Ovary {
             // We can't remove first level nest
             cmds.push(await rexec(`rm ${this.settings.work_dir.merged}/${dirname} -rf`, this.verbose))
           }
-        } else if (N8.isFile(dirname)) {
+        } else if (fs.statSync(`/${dirname}`).isFile()) {
           cmds.push(`\n# ${dirname} = file`)
           cmds.push(await rexec(`rm ${this.settings.work_dir.merged}/${dirname}`, this.verbose))
-        } else if (N8.isSymbolicLink(dirname)) {
+        } else if (fs.statSync(`/${dirname}`).isSymbolicLink()) {
           cmds.push(`\n# ${dirname} = symbolicLink`)
           cmds.push(await rexec(`rm ${this.settings.work_dir.merged}/${dirname}`, this.verbose))
         }

diff --git a/src/classes/pacman.ts b/src/classes/pacman.ts
@@ -45,16 +45,12 @@ export default class Pacman {
    * @param verbose
    */
   static async autocompleteInstall(verbose = false) {
-    if (this.distro().familyId === 'debian') {
-      if (Pacman.packageIsInstalled('bash-completion')) {
-        if (fs.existsSync('/usr/share/bash-completion/completions/')) {
-          await exec(`cp ${__dirname}/../../scripts/eggs.bash /usr/share/bash-completion/completions/`)
-        } else if (fs.existsSync('/etc/bash_completion.d/')) {
-          await exec(`cp ${__dirname}/../../scripts/eggs.bash /etc/bash_completion.d/`)
-        }
+    if (Pacman.packageIsInstalled('bash-completion')) {
+      if (fs.existsSync('/usr/share/bash-completion/completions/')) {
+        await exec(`cp ${__dirname}/../../scripts/eggs.bash /usr/share/bash-completion/completions/`)
+      } else if (fs.existsSync('/etc/bash_completion.d/')) {
+        await exec(`cp ${__dirname}/../../scripts/eggs.bash /etc/bash_completion.d/`)
       }
-    } else if (this.distro().familyId === 'archlinux' && Pacman.packageIsInstalled('bash-completion')) {
-      await exec(`cp ${__dirname}/../../scripts/eggs.bash /usr/share/bash-completion/completions/`)
     }
   }
 
@@ -75,7 +71,7 @@ export default class Pacman {
       } else if (this.distro().familyId === 'fedora') {
         await Fedora.calamaresInstall(verbose)
       } else if (this.distro().familyId === 'archlinux') {
-        if (this.distro().distroId === 'ManjaroLinux' || this.distro().distroId === 'BigLinux' ) {
+        if (this.distro().distroId === 'ManjaroLinux' || this.distro().distroId === 'BigLinux') {
           const cmd = `pacman -Sy --noconfirm calamares`
           try {
             await exec(cmd, Utils.setEcho(true))
@@ -398,7 +394,7 @@ export default class Pacman {
       const dest = '/etc/penguins-eggs.d/distros/excalibur'
       await exec(`cp -r ${buster}/calamares ${dest}/calamares`, echo)
 
-      
+
       /***********************************************************************************
        * Ubuntu
        **********************************************************************************/
@@ -619,7 +615,7 @@ export default class Pacman {
         installed = true
       }
     } else if (this.distro().familyId === 'opensuse') {
-      if (Opensuse.packageIsInstalled('xorg-x11-server')) { 
+      if (Opensuse.packageIsInstalled('xorg-x11-server')) {
         installed = true
       }
     }

diff --git a/src/classes/xdg.ts b/src/classes/xdg.ts
@@ -13,7 +13,6 @@ import shx from 'shelljs'
 // libraries
 import { exec } from '../lib/utils.js'
 import Distro from './distro.js'
-import N8 from './n8.js'
 import Pacman from './pacman.js'
 import Utils from './utils.js'
 
@@ -69,7 +68,8 @@ export default class Xdg {
         const files = fs.readdirSync(dc)
         for (const elem of files) {
           const curFile = dc + elem
-          if (!N8.isDirectory(curFile)) {
+          if (!fs.statSync(`/${curFile}`).isDirectory()) {
+          //if (!N8.isDirectory(curFile)) {
             let content = fs.readFileSync(curFile, 'utf8')
             const find = '[Seat:*]'
             if (content.includes(find)) {