From 961e5430fd5e27568d508443450b998a3fce3a41 Mon Sep 17 00:00:00 2001
From: koumakpet <koumakpet@protonmail.com>
Date: Sun, 8 Mar 2020 17:21:46 +0100
Subject: [PATCH] Added multiple packages, reenabled upgrade

---
 lib.py             | 13 +++++++------
 package_install.py |  7 +++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/lib.py b/lib.py
index 71be9a3..50e84a2 100644
--- a/lib.py
+++ b/lib.py
@@ -242,7 +242,7 @@ class Install:
             Print.cancel(f'{package_name} already installed')
             return False
 
-    def multiple_packages(packages, install_text, options, reinstall=False):
+    def multiple_packages(packages, install_text, options=False, reinstall=False):
         '''Installation of multiple packages
 
         Arguments:
@@ -254,6 +254,8 @@ class Install:
             bool/str -- False if none / chosen package name
         '''
         if Install.check_not_installed(packages) or reinstall:
+            if not options:
+                options = packages
             choice = Input.multiple(f'{install_text}', options)
             if choice:
                 for index, option in enumerate(options):
@@ -270,8 +272,7 @@ class Install:
             return False
 
     def upgrade_pacman():
-        # if Input.yes_no('Do you wish to Sync(S), refresh(y) and upgrade(u) pacman - Recommended?'):
-        #     Command.execute('sudo pacman -Syu')
-        # else:
-        #     Print.warning('Pacman upgrade cancelled.')
-        pass
+        if Input.yes_no('Do you wish to Sync(S), refresh(y) and upgrade(u) pacman - Recommended?'):
+            Command.execute('sudo pacman -Syu')
+        else:
+            Print.warning('Pacman upgrade cancelled.')
diff --git a/package_install.py b/package_install.py
index c6b7841..5e3e0f6 100644
--- a/package_install.py
+++ b/package_install.py
@@ -23,7 +23,11 @@ Install.multiple_packages(['sddm', 'gdm', 'lightdm'], 'Do you wish to install DM
 Install.package('exa', 'default + (Better ls tool)')
 Install.package('terminator', 'default + (advanced terminal)')
 Install.package('konsole', 'default + (KDE terminal emulator)')
+Install.package(
+    'ark', 'default + (Managing various archive formats such as tar, gzip, zip, rar, etc.)')
+Install.package('cron', '(Task scheduling)')
 Install.package('dolphin', 'default + (File Manager)')
+Install.package('nomacs', 'default + (Photo viewer & editor)')
 Install.package('discord', 'default + (Chat App)')
 # TODO: Spotify (YAY)
 Install.package(
@@ -33,5 +37,8 @@ Install.package('gnome-system-monitor',
                 'Do you wish to install gnome system monitor?')
 Install.package(
     'code', 'Do you wish to install Visual Studio Code (Text/Code Editor)?')
+Install.package('filelight', 'default + (Disk usage statistics and graphs)')
+Install.multiple_packages(['firefox', 'chromium'],
+                          'Do you wish to install web browser?')
 
 Print.action('Package Installation Complete')