codify-plugin-lib 1.0.182-beta62 → 1.0.182-beta64

package/dist/utils/index.d.ts

@@ -8,6 +8,25 @@ export declare enum Shell {
     CSH = "csh",
     FISH = "fish"
 }
+export declare enum LinuxDistro {
+    ARCH = "arch",
+    CENTOS = "centos",
+    DEBIAN = "debian",
+    FEDORA = "fedora",
+    RHEL = "rhel",
+    UBUNTU = "ubuntu",
+    ALPINE = "alpine",
+    AMAZON_LINUX = "amzn",
+    OPENSUSE = "opensuse",
+    SUSE = "sles",
+    MANJARO = "manjaro",
+    MINT = "linuxmint",
+    POP_OS = "pop",
+    ELEMENTARY_OS = "elementary",
+    KALI = "kali",
+    GENTOO = "gentoo",
+    SLACKWARE = "slackware"
+}
 export interface SystemInfo {
     os: OS;
     shell: Shell;
@@ -32,7 +51,13 @@ export declare const Utils: {
      * Installs a package via the system package manager. This will use Homebrew on macOS and apt on Ubuntu/Debian or dnf on Fedora.
      * @param packageName
      */
-    installViaPkgMgr(packageName: string): Promise<boolean>;
+    installViaPkgMgr(packageName: string): Promise<void>;
     uninstallViaPkgMgr(packageName: string): Promise<boolean>;
-    linuxDistro(): Promise<"arch" | "centos" | "debian" | "fedora" | "rhel" | "ubuntu" | undefined>;
+    getLinuxDistro(): Promise<LinuxDistro | undefined>;
+    isUbuntu(): Promise<boolean>;
+    isDebian(): Promise<boolean>;
+    isArch(): Promise<boolean>;
+    isCentOS(): Promise<boolean>;
+    isFedora(): Promise<boolean>;
+    isRHEL(): Promise<boolean>;
 };

package/dist/utils/index.js

@@ -14,6 +14,26 @@ export var Shell;
     Shell["CSH"] = "csh";
     Shell["FISH"] = "fish";
 })(Shell || (Shell = {}));
+export var LinuxDistro;
+(function (LinuxDistro) {
+    LinuxDistro["ARCH"] = "arch";
+    LinuxDistro["CENTOS"] = "centos";
+    LinuxDistro["DEBIAN"] = "debian";
+    LinuxDistro["FEDORA"] = "fedora";
+    LinuxDistro["RHEL"] = "rhel";
+    LinuxDistro["UBUNTU"] = "ubuntu";
+    LinuxDistro["ALPINE"] = "alpine";
+    LinuxDistro["AMAZON_LINUX"] = "amzn";
+    LinuxDistro["OPENSUSE"] = "opensuse";
+    LinuxDistro["SUSE"] = "sles";
+    LinuxDistro["MANJARO"] = "manjaro";
+    LinuxDistro["MINT"] = "linuxmint";
+    LinuxDistro["POP_OS"] = "pop";
+    LinuxDistro["ELEMENTARY_OS"] = "elementary";
+    LinuxDistro["KALI"] = "kali";
+    LinuxDistro["GENTOO"] = "gentoo";
+    LinuxDistro["SLACKWARE"] = "slackware";
+})(LinuxDistro || (LinuxDistro = {}));
 export const Utils = {
     getUser() {
         return os.userInfo().username;
@@ -159,28 +179,38 @@ Brew can be installed using Codify:
         const $ = getPty();
         if (Utils.isMacOS()) {
             await this.assertBrewInstalled();
-            const { status } = await $.spawnSafe(`brew install ${packageName}`, { interactive: true, env: { HOMEBREW_NO_AUTO_UPDATE: 1 } });
-            return status === SpawnStatus.SUCCESS;
+            await $.spawn(`brew install ${packageName}`, { interactive: true, env: { HOMEBREW_NO_AUTO_UPDATE: 1 } });
         }
         if (Utils.isLinux()) {
             const isAptInstalled = await $.spawnSafe('which apt');
             if (isAptInstalled.status === SpawnStatus.SUCCESS) {
-                const { status } = await $.spawnSafe(`apt -y install ${packageName}`, { interactive: true, requiresRoot: true, env: { DEBIAN_FRONTEND: 'noninteractive' } });
-                return status === SpawnStatus.SUCCESS;
+                await $.spawn('apt-get update', { requiresRoot: true });
+                const { status, data } = await $.spawnSafe(`apt-get -y install ${packageName}`, { requiresRoot: true, env: { DEBIAN_FRONTEND: 'noninteractive' } });
+                if (status === SpawnStatus.ERROR && data.includes('E: dpkg was interrupted, you must manually run \'sudo dpkg --configure -a\' to correct the problem.')) {
+                    await $.spawn('dpkg --configure -a', { requiresRoot: true });
+                    await $.spawn(`apt-get -y install ${packageName}`, { requiresRoot: true, env: { DEBIAN_FRONTEND: 'noninteractive' } });
+                    return;
+                }
+                if (status === SpawnStatus.ERROR) {
+                    throw new Error(`Failed to install package ${packageName} via apt: ${data}`);
+                }
             }
             const isDnfInstalled = await $.spawnSafe('which dnf');
             if (isDnfInstalled.status === SpawnStatus.SUCCESS) {
-                const { status } = await $.spawnSafe(`dnf install ${packageName} -y`, { interactive: true, requiresRoot: true });
-                return status === SpawnStatus.SUCCESS;
+                await $.spawn('dnf update', { requiresRoot: true });
+                await $.spawn(`dnf install ${packageName} -y`, { requiresRoot: true });
             }
             const isYumInstalled = await $.spawnSafe('which yum');
             if (isYumInstalled.status === SpawnStatus.SUCCESS) {
-                const { status } = await $.spawnSafe(`yum install ${packageName} -y`, { interactive: true, requiresRoot: true });
-                return status === SpawnStatus.SUCCESS;
+                await $.spawn('yum update', { requiresRoot: true });
+                await $.spawn(`yum install ${packageName} -y`, { requiresRoot: true });
+            }
+            const isPacmanInstalled = await $.spawnSafe('which pacman');
+            if (isPacmanInstalled.status === SpawnStatus.SUCCESS) {
+                await $.spawn('pacman -Syu', { requiresRoot: true });
+                await $.spawn(`pacman -S ${packageName} --noconfirm`, { requiresRoot: true });
             }
-            return false;
         }
-        return false;
     },
     async uninstallViaPkgMgr(packageName) {
         const $ = getPty();
@@ -192,31 +222,50 @@ Brew can be installed using Codify:
         if (Utils.isLinux()) {
             const isAptInstalled = await $.spawnSafe('which apt');
             if (isAptInstalled.status === SpawnStatus.SUCCESS) {
-                const { status } = await $.spawnSafe(`apt autoremove -y --purge ${packageName}`, { interactive: true, requiresRoot: true, env: { DEBIAN_FRONTEND: 'noninteractive' } });
+                const { status } = await $.spawnSafe(`apt-get autoremove -y --purge ${packageName}`, { requiresRoot: true, env: { DEBIAN_FRONTEND: 'noninteractive' } });
                 return status === SpawnStatus.SUCCESS;
             }
             const isDnfInstalled = await $.spawnSafe('which dnf');
             if (isDnfInstalled.status === SpawnStatus.SUCCESS) {
-                const { status } = await $.spawnSafe(`dnf autoremove ${packageName} -y`, { interactive: true, requiresRoot: true });
+                const { status } = await $.spawnSafe(`dnf autoremove ${packageName} -y`, { requiresRoot: true });
                 return status === SpawnStatus.SUCCESS;
             }
             const isYumInstalled = await $.spawnSafe('which yum');
             if (isYumInstalled.status === SpawnStatus.SUCCESS) {
-                const { status } = await $.spawnSafe(`yum autoremove ${packageName} -y`, { interactive: true, requiresRoot: true });
+                const { status } = await $.spawnSafe(`yum autoremove ${packageName} -y`, { requiresRoot: true });
                 return status === SpawnStatus.SUCCESS;
             }
             return false;
         }
         return false;
     },
-    async linuxDistro() {
+    async getLinuxDistro() {
         const osRelease = await fs.readFile('/etc/os-release', 'utf8');
         const lines = osRelease.split('\n');
         for (const line of lines) {
             if (line.startsWith('ID=')) {
-                return line.slice(3).trim();
+                const distroId = line.slice(3).trim().replace(/"/g, '');
+                return Object.values(LinuxDistro).includes(distroId) ? distroId : undefined;
             }
         }
         return undefined;
-    }
+    },
+    async isUbuntu() {
+        return (await this.getLinuxDistro()) === LinuxDistro.UBUNTU;
+    },
+    async isDebian() {
+        return (await this.getLinuxDistro()) === LinuxDistro.DEBIAN;
+    },
+    async isArch() {
+        return (await this.getLinuxDistro()) === LinuxDistro.ARCH;
+    },
+    async isCentOS() {
+        return (await this.getLinuxDistro()) === LinuxDistro.CENTOS;
+    },
+    async isFedora() {
+        return (await this.getLinuxDistro()) === LinuxDistro.FEDORA;
+    },
+    async isRHEL() {
+        return (await this.getLinuxDistro()) === LinuxDistro.RHEL;
+    },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codify-plugin-lib",
-  "version": "1.0.182-beta62",
+  "version": "1.0.182-beta64",
   "description": "Library plugin library",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/utils/index.ts

@@ -18,6 +18,26 @@ export enum Shell {
   FISH = 'fish',
 }
 
+export enum LinuxDistro {
+  ARCH = 'arch',
+  CENTOS = 'centos',
+  DEBIAN = 'debian',
+  FEDORA = 'fedora',
+  RHEL = 'rhel',
+  UBUNTU = 'ubuntu',
+  ALPINE = 'alpine',
+  AMAZON_LINUX = 'amzn',
+  OPENSUSE = 'opensuse',
+  SUSE = 'sles',
+  MANJARO = 'manjaro',
+  MINT = 'linuxmint',
+  POP_OS = 'pop',
+  ELEMENTARY_OS = 'elementary',
+  KALI = 'kali',
+  GENTOO = 'gentoo',
+  SLACKWARE = 'slackware',
+}
+
 export interface SystemInfo {
   os: OS;
   shell: Shell;
@@ -196,38 +216,51 @@ Brew can be installed using Codify:
    * Installs a package via the system package manager. This will use Homebrew on macOS and apt on Ubuntu/Debian or dnf on Fedora.
    * @param packageName
    */
-  async installViaPkgMgr(packageName: string): Promise<boolean> {
+  async installViaPkgMgr(packageName: string): Promise<void> {
     const $ = getPty();
 
     if (Utils.isMacOS()) {
       await this.assertBrewInstalled();
-      const { status } = await $.spawnSafe(`brew install ${packageName}`, { interactive: true, env: { HOMEBREW_NO_AUTO_UPDATE: 1 } });
-      return status === SpawnStatus.SUCCESS;
+      await $.spawn(`brew install ${packageName}`, { interactive: true, env: { HOMEBREW_NO_AUTO_UPDATE: 1 } });
     }
 
     if (Utils.isLinux()) {
       const isAptInstalled = await $.spawnSafe('which apt');
       if (isAptInstalled.status === SpawnStatus.SUCCESS) {
-        const { status } = await $.spawnSafe(`apt -y install ${packageName}`, { interactive: true, requiresRoot: true, env: { DEBIAN_FRONTEND: 'noninteractive' } });
-        return status === SpawnStatus.SUCCESS;
+        await $.spawn('apt-get update', { requiresRoot: true });
+        const { status, data } = await $.spawnSafe(`apt-get -y install ${packageName}`, { requiresRoot: true, env: { DEBIAN_FRONTEND: 'noninteractive' } });
+
+        if (status === SpawnStatus.ERROR && data.includes('E: dpkg was interrupted, you must manually run \'sudo dpkg --configure -a\' to correct the problem.')) {
+          await $.spawn('dpkg --configure -a', { requiresRoot: true });
+          await $.spawn(`apt-get -y install ${packageName}`, { requiresRoot: true, env: { DEBIAN_FRONTEND: 'noninteractive' } });
+
+          return;
+        }
+
+        if (status === SpawnStatus.ERROR) {
+          throw new Error(`Failed to install package ${packageName} via apt: ${data}`);
+        }
       }
 
       const isDnfInstalled = await $.spawnSafe('which dnf');
       if (isDnfInstalled.status === SpawnStatus.SUCCESS) {
-        const { status } = await $.spawnSafe(`dnf install ${packageName} -y`, { interactive: true, requiresRoot: true });
-        return status === SpawnStatus.SUCCESS;
+        await $.spawn('dnf update', { requiresRoot: true });
+        await $.spawn(`dnf install ${packageName} -y`, { requiresRoot: true });
       }
 
       const isYumInstalled = await $.spawnSafe('which yum');
       if (isYumInstalled.status === SpawnStatus.SUCCESS) {
-        const { status } = await $.spawnSafe(`yum install ${packageName} -y`, { interactive: true, requiresRoot: true });
-        return status === SpawnStatus.SUCCESS;
+        await $.spawn('yum update', { requiresRoot: true });
+        await $.spawn(`yum install ${packageName} -y`, { requiresRoot: true });
       }
 
-      return false;
-    }
+      const isPacmanInstalled = await $.spawnSafe('which pacman');
+      if (isPacmanInstalled.status === SpawnStatus.SUCCESS) {
+        await $.spawn('pacman -Syu', { requiresRoot: true });
+        await $.spawn(`pacman -S ${packageName} --noconfirm`, { requiresRoot: true });
+      }
 
-    return false;
+    }
   },
 
   async uninstallViaPkgMgr(packageName: string): Promise<boolean> {
@@ -242,19 +275,19 @@ Brew can be installed using Codify:
     if (Utils.isLinux()) {
       const isAptInstalled = await $.spawnSafe('which apt');
       if (isAptInstalled.status === SpawnStatus.SUCCESS) {
-        const { status } = await $.spawnSafe(`apt autoremove -y --purge ${packageName}`, { interactive: true, requiresRoot: true, env: { DEBIAN_FRONTEND: 'noninteractive' } });
+        const { status } = await $.spawnSafe(`apt-get autoremove -y --purge ${packageName}`, { requiresRoot: true, env: { DEBIAN_FRONTEND: 'noninteractive' } });
         return status === SpawnStatus.SUCCESS;
       }
 
       const isDnfInstalled = await $.spawnSafe('which dnf');
       if (isDnfInstalled.status === SpawnStatus.SUCCESS) {
-        const { status } = await $.spawnSafe(`dnf autoremove ${packageName} -y`, { interactive: true, requiresRoot: true });
+        const { status } = await $.spawnSafe(`dnf autoremove ${packageName} -y`, { requiresRoot: true });
         return status === SpawnStatus.SUCCESS;
       }
 
       const isYumInstalled = await $.spawnSafe('which yum');
       if (isYumInstalled.status === SpawnStatus.SUCCESS) {
-        const { status } = await $.spawnSafe(`yum autoremove ${packageName} -y`, { interactive: true, requiresRoot: true });
+        const { status } = await $.spawnSafe(`yum autoremove ${packageName} -y`, { requiresRoot: true });
         return status === SpawnStatus.SUCCESS;
       }
 
@@ -264,18 +297,42 @@ Brew can be installed using Codify:
     return false;
   },
 
-
-  async linuxDistro(): Promise<'arch' | 'centos' | 'debian' | 'fedora' | 'rhel' | 'ubuntu' | undefined> {
+  async getLinuxDistro(): Promise<LinuxDistro | undefined> {
     const osRelease = await fs.readFile('/etc/os-release', 'utf8');
     const lines = osRelease.split('\n');
     for (const line of lines) {
       if (line.startsWith('ID=')) {
-        return line.slice(3).trim() as any;
+        const distroId = line.slice(3).trim().replace(/"/g, '');
+        return Object.values(LinuxDistro).includes(distroId as LinuxDistro) ? distroId as LinuxDistro : undefined;
       }
     }
     
     return undefined;
-  }
+  },
+
+  async isUbuntu(): Promise<boolean> {
+    return (await this.getLinuxDistro()) === LinuxDistro.UBUNTU;
+  },
+
+  async isDebian(): Promise<boolean> {
+    return (await this.getLinuxDistro()) === LinuxDistro.DEBIAN;
+  },
+
+  async isArch(): Promise<boolean> {
+    return (await this.getLinuxDistro()) === LinuxDistro.ARCH;
+  },
+
+  async isCentOS(): Promise<boolean> {
+    return (await this.getLinuxDistro()) === LinuxDistro.CENTOS;
+  },
+
+  async isFedora(): Promise<boolean> {
+    return (await this.getLinuxDistro()) === LinuxDistro.FEDORA;
+  },
+
+  async isRHEL(): Promise<boolean> {
+    return (await this.getLinuxDistro()) === LinuxDistro.RHEL;
+  },
 };