Merge pull request #377 from vvasuki/sys_tools

Add more system tools and descriptions
helmuthdu · Apr 14, 2018 · e15a0fc · e15a0fc
2 parents 2069722 + 05504d5
commit e15a0fc
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 45 deletions.
diff --git a/lilo b/lilo
@@ -1721,21 +1721,24 @@ install_system_apps(){
   while true
   do
     print_title "SYSTEM TOOLS APPS"
-    echo " 1) $(menu_item "clamav")"
-    echo " 2) $(menu_item "cockpit") $AUR"
-    echo " 3) $(menu_item "docker")"
-    echo " 4) $(menu_item "firewalld")"
-    echo " 5) $(menu_item "gparted")"
-    echo " 6) $(menu_item "grsync")"
-    echo " 7) $(menu_item "hosts-update") $AUR"
-    echo " 8) $(menu_item "htop")"
-    echo " 9) $(menu_item "plex-media-server" "Plex") $AUR"
-    echo "10) $(menu_item "ufw") $AUR"
-    echo "11) $(menu_item "unified-remote-server" "Unified Remote") $AUR"
-    echo "12) $(menu_item "virtualbox")"
-    echo "13) $(menu_item "wine")"
-    echo "14) $(menu_item "netdata")"
-    echo "15) $(menu_item "nload")"
+    echo " 1) $(menu_item "clamav" "clamav antivirus")"
+    echo " 2) $(menu_item "cockpit" "cockpit- A web system administration tool") $AUR"
+    echo " 3) $(menu_item "webmin" "webmin- A web system administration tool") $AUR"
+    echo " 4) $(menu_item "docker")"
+    echo " 5) $(menu_item "firewalld")"
+    echo " 6) $(menu_item "gparted")"
+    echo " 7) $(menu_item "grsync" "grsync- Sync files")"
+    echo " 8) $(menu_item "hosts-update" "hosts-update Injects the mvps blocklist to /etc/hosts to prevent thousands of parasites, hijackers and unwanted adware/spyware/privacy websites from working.") $AUR"
+    echo " 9) $(menu_item "htop" "htop- Interactive text-mode process viewer")"
+    echo "10) $(menu_item "plex-media-server" "Plex") $AUR"
+    echo "11) $(menu_item "ufw") $AUR"
+    echo "12) $(menu_item "unified-remote-server" "Unified Remote") $AUR"
+    echo "13) $(menu_item "virtualbox")"
+    echo "14) $(menu_item "wine")"
+    echo "15) $(menu_item "netdata")"
+    echo "16) $(menu_item "nload")"
+    echo "17) $(menu_item "gnome-logs" "Assorted Graphical log viewers")"
+    echo "18) $(menu_item "seahorse" "seahorse Password keyring management GUI")"
     echo ""
     echo " b) BACK"
     echo ""
@@ -1756,44 +1759,47 @@ install_system_apps(){
           aur_package_install "cockpit storaged linux-user-chroot ostree"
           ;;
         3)
+          aur_package_install "webmin"
+          ;;
+        4)
           package_install "docker"
           add_user_to_group ${username} docker
           ;;
-        4)
+        5)
           is_package_installed "ufw" && package_remove "ufw"
           is_package_installed "firewalld" && package_remove "firewalld"
           package_install "firewalld"
           system_ctl enable firewalld
           ;;
-        5)
+        6)
           package_install "gparted"
           ;;
-        6)
+        7)
           package_install "grsync"
           ;;
-        7)
+        8)
           aur_package_install "hosts-update"
           hosts-update
           ;;
-        8)
+        9)
           package_install "htop"
           ;;
-        9)
+        10)
           aur_package_install "plex-media-server"
           system_ctl enable plexmediaserver.service
           ;;
-        10)
+        11)
           print_title "UFW - https://wiki.archlinux.org/index.php/Ufw"
           print_info "Ufw stands for Uncomplicated Firewall, and is a program for managing a netfilter firewall. It provides a command line interface and aims to be uncomplicated and easy to use."
           is_package_installed "firewalld" && package_remove "firewalld"
           aur_package_install "ufw gufw"
           system_ctl enable ufw.service
           ;;
-        11)
+        12)
           aur_package_install "unified-remote-server"
           system_ctl enable urserver.service
           ;;
-        12)
+        13)
           #Make sure we are not a VirtualBox Guest
           VIRTUALBOX_GUEST=`dmidecode --type 1 | grep VirtualBox`
           if [[ -z ${VIRTUALBOX_GUEST} ]]; then
@@ -1805,16 +1811,24 @@ install_system_apps(){
             cecho "${BBlue}[${Reset}${Bold}!${BBlue}]${Reset} VirtualBox was not installed as we are a VirtualBox guest."
           fi
           ;;
-        13)
+        14)
           package_install "icoutils wine wine_gecko wine-mono winetricks"
           ;;
-        14)
+        15)
           package_install "netdata"
           system_ctl enable netdata.service
           ;;
-        15)
+        16)
           package_install "nload"
           ;;
+        17)
+          package_install "gnome-logs"
+          package_install "qjournalctl"
+          package_install "pacmanlogviewer"
+          ;;
+        18)
+          package_install "seahorse"
+          ;;
         "b")
           break
           ;;
@@ -1920,6 +1934,7 @@ install_internet_apps(){
             echo " 4) $(menu_item "midori konqueror" "$([[ ${KDE} -eq 1 ]] && echo "Konqueror" || echo "Midori";)")"
             echo " 5) $(menu_item "opera")"
             echo " 6) $(menu_item "vivaldi") $AUR"
+            echo " 7) $(menu_item "tor browser") $AUR"
             echo ""
             echo " b) BACK"
             echo ""
@@ -1949,6 +1964,9 @@ install_internet_apps(){
                 6)
                   aur_package_install "vivaldi"
                   ;;
+                7)
+                  aur_package_install "tor-browser"
+                  ;;
                 "b")
                   break
                   ;;
@@ -1979,7 +1997,8 @@ install_internet_apps(){
             echo "10) $(menu_item "transmission-qt transmission-gtk" "Transmission")"
             echo "11) $(menu_item "uget")"
             echo "12) $(menu_item "youtube-dl")"
-	    echo "13) $(menu_item "tixati") $AUR"
+    	    echo "13) $(menu_item "tixati" "tixati p2p bittorrent client") $AUR"
+    	    echo "14) $(menu_item "google-drive-ocamlfuse" "google-drive-ocamlfuse") $AUR"
             echo ""
             echo " b) BACK"
             echo ""
@@ -2031,9 +2050,12 @@ install_internet_apps(){
                 12)
                   package_install "youtube-dl"
                   ;;
-		13)
-		  aur_package_install "tixati"
-		  ;;
+                13)
+                  aur_package_install "tixati"
+                  ;;
+                14)
+                  aur_package_install "google-drive-ocamlfuse"
+                  ;;
                 "b")
                   break
                   ;;

diff --git a/lilo.automode b/lilo.automode
@@ -184,20 +184,23 @@
 #SYSTEM TOOLS {{{
   # 1) ClamAV
   # 2) Cockpit
-  # 3) Docker
-  # 4) FirewallD
-  # 5) Gparted
-  # 6) Grsync
-  # 7) Hosts Update
-  # 8) Htop
-  # 9) Plex
-  #10) UFW
-  #11) Unified Remote
-  #12) Virtualbox
-  #13) Wine
-  #14) netdata
-  #15) nload
-  SYSTEMTOOLS_OPTIONS="10"
+  # 3) Webmin
+  # 4) Docker
+  # 5) FirewallD
+  # 6) Gparted
+  # 7) Grsync
+  # 8) Hosts Update
+  # 9) Htop
+  #10) Plex
+  #11) UFW
+  #12) Unified Remote
+  #13) Virtualbox
+  #14) Wine
+  #15) netdata
+  #16) nload
+  #17) Assorted Graphical log viewers
+  #18) seahorse Password keyring management GUI
+  SYSTEMTOOLS_OPTIONS="11"
 #}}}
 #GRAPHICS {{{
   # 1) Blender
@@ -227,6 +230,7 @@
     # 4) Midori|Konqueror
     # 5) Opera
     # 6) Vivaldi
+    # 7) Tor-browser
     BROWSERS_OPTIONS="3"
   #}}}
   #DOWNLOAD|FILESHARE {{{
@@ -243,6 +247,7 @@
     #11) uGet
     #12) youtube-dl
     #13) tixati
+    #14) tixati
     DOWNLOAD_OPTIONS=""
   #}}}
   #EMAIL|RSS {{{