Finished installation script.

SingularisArt · Aug 10, 2024 · 61208bc · 61208bc
1 parent 382ada3
commit 61208bc
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 52 deletions.
diff --git a/aspects/dotfiles/files/.local/share/autojump/autojump.txt b/aspects/dotfiles/files/.local/share/autojump/autojump.txt
diff --git a/aspects/email/aspect.json b/aspects/email/aspect.json
@@ -1,6 +1,7 @@
 {
   "description": "My email setup",
   "files": {
+    ".home": {},
     ".config": {
       "abook": "public",
       "gcalcli": "public",
@@ -11,9 +12,11 @@
       "khard": "public",
       "neomutt": "public",
       "vdirsyncer": "public"
-    }
+    },
+    ".local": {}
   },
   "templates": {
+    ".home": {},
     ".config": {
       "mbsync/mbsyncrc": [
         "email_1",
@@ -58,44 +61,55 @@
         "user",
         "primary_email"
       ]
-    }
+    },
+    ".local": {}
   },
   "packages": {
-    "abook": [
-      "abook"
-    ],
-    "gcalcli": [
-      "gcalcli"
-    ],
-    "glow": [
-      "glow"
-    ],
-    "goobook": [
-      "goobook"
-    ],
-    "imapfilter": [
-      "imapfilter"
-    ],
-    "khal": [
-      "khal"
-    ],
-    "khard": [
-      "khard"
-    ],
-    "neomutt": [
-      "neomutt"
-    ],
-    "vdirsyncer": [
-      "vdirsyncer"
-    ],
-    "mbsync": [
-      "isync"
-    ],
-    "msmtp": [
-      "msmtp"
-    ],
-    "notmuch": [
-      "notmuch"
-    ]
+    "aur": {
+      "abook": [
+        "abook"
+      ],
+      "gcalcli": [
+        "gcalcli"
+      ],
+      "glow": [
+        "glow"
+      ],
+      "goobook": [
+        "goobook"
+      ],
+      "imapfilter": [
+        "imapfilter"
+      ],
+      "khal": [
+        "khal"
+      ],
+      "khard": [
+        "khard"
+      ],
+      "neomutt": [
+        "neomutt"
+      ],
+      "vdirsyncer": [
+        "vdirsyncer"
+      ],
+      "mbsync": [
+        "mbsync"
+      ],
+      "msmtp": [
+        "msmtp"
+      ],
+      "notmuch": [
+        "notmuch"
+      ]
+    },
+    "pacman": {},
+    "apt": {},
+    "apt-get": {},
+    "yum": {}
+  },
+  "libraries": {
+    "python": {},
+    "npm": {}
   }
 }
diff --git a/man/operations/packages.py b/man/operations/packages.py
@@ -76,19 +76,21 @@ def install_package(self, package_name):
             log.log_info(f"Would install package '{pretty_name}'.")
             return
 
-        if self.args.confirm and helpers.confirm(
+        if self.args.confirm and not helpers.confirm(
             f"Would you like to install the package '{pretty_name}'"
         ):
-            loader = Loader(log.log_info, log.log_error)
-            try:
-                loader.start(f"Installing package '{pretty_name}'")
-                log_level = int(self.args.log_level) if self.args.log_level else -1
-                install_package(
-                    package_name,
-                    log_level,
-                    confirm=self.args.confirm,
-                    package_type=self.package_type,
-                )
-                loader.success(f"Installed package '{pretty_name}'.")
-            except subprocess.CalledProcessError:
-                loader.failure(f"Failed to install package '{pretty_name}'.")
+            return
+
+        loader = Loader(log.log_info, log.log_error)
+        try:
+            loader.start(f"Installing package '{pretty_name}'")
+            log_level = int(self.args.log_level) if self.args.log_level else -1
+            install_package(
+                package_name,
+                log_level,
+                confirm=self.args.confirm,
+                package_type=self.package_type,
+            )
+            loader.success(f"Installed package '{pretty_name}'.")
+        except subprocess.CalledProcessError:
+            loader.failure(f"Failed to install package '{pretty_name}'.")