From e80b0560676c234e5e690140ec93d2db965abc27 Mon Sep 17 00:00:00 2001 From: vvasuki Date: Thu, 22 Mar 2018 19:17:04 -0700 Subject: [PATCH 1/5] Add more system tools and descriptions --- lilo | 68 ++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/lilo b/lilo index f3518b62..9ae44e37 100755 --- a/lilo +++ b/lilo @@ -1713,21 +1713,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 "" @@ -1748,44 +1751,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 @@ -1797,16 +1803,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 ;; From 219420cf1ea8f313dfa0fcbfebafb24e939f3836 Mon Sep 17 00:00:00 2001 From: vvasuki Date: Wed, 28 Mar 2018 13:39:26 -0700 Subject: [PATCH 2/5] Add tor tools --- lilo | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lilo b/lilo index 9ae44e37..371051aa 100755 --- a/lilo +++ b/lilo @@ -1731,6 +1731,7 @@ install_system_apps(){ 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 "19) $(menu_item "tor" "tor Tor network and tools for anonymous browsing.")" echo "" echo " b) BACK" echo "" @@ -1821,6 +1822,10 @@ install_system_apps(){ 18) package_install "seahorse" ;; + 19) + package_install "tor torsocks arm" + aur_package_install "tor-browser" + ;; "b") break ;; From b984e675e527aca261373d64026a005f363465c8 Mon Sep 17 00:00:00 2001 From: vvasuki Date: Wed, 28 Mar 2018 15:58:16 -0700 Subject: [PATCH 3/5] Move tor-browser to browser list. Fix lilo.automode --- lilo | 9 ++++----- lilo.automode | 30 +++++++++++++++++------------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/lilo b/lilo index 371051aa..5f4c4005 100755 --- a/lilo +++ b/lilo @@ -1731,7 +1731,6 @@ install_system_apps(){ 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 "19) $(menu_item "tor" "tor Tor network and tools for anonymous browsing.")" echo "" echo " b) BACK" echo "" @@ -1822,10 +1821,6 @@ install_system_apps(){ 18) package_install "seahorse" ;; - 19) - package_install "tor torsocks arm" - aur_package_install "tor-browser" - ;; "b") break ;; @@ -1931,6 +1926,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 "" @@ -1960,6 +1956,9 @@ install_internet_apps(){ 6) aur_package_install "vivaldi" ;; + 7) + aur_package_install "tor-browser" + ;; "b") break ;; diff --git a/lilo.automode b/lilo.automode index cabae584..379d4d85 100755 --- a/lilo.automode +++ b/lilo.automode @@ -183,19 +183,22 @@ #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 + # 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="10" #}}} #GRAPHICS {{{ @@ -226,6 +229,7 @@ # 4) Midori|Konqueror # 5) Opera # 6) Vivaldi + # 7) Tor-browser BROWSERS_OPTIONS="3" #}}} #DOWNLOAD|FILESHARE {{{ From f2542f38bfab968379dc7a55c63323ef9b4db54a Mon Sep 17 00:00:00 2001 From: vvasuki Date: Wed, 28 Mar 2018 16:08:07 -0700 Subject: [PATCH 4/5] Install UFW by default. --- lilo.automode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lilo.automode b/lilo.automode index 379d4d85..b89b82ea 100755 --- a/lilo.automode +++ b/lilo.automode @@ -199,7 +199,7 @@ #16) nload #17) Assorted Graphical log viewers #18) seahorse Password keyring management GUI - SYSTEMTOOLS_OPTIONS="10" + SYSTEMTOOLS_OPTIONS="11" #}}} #GRAPHICS {{{ # 1) Blender From 05504d598ef23e92212e17b02dc2bb679e18c848 Mon Sep 17 00:00:00 2001 From: vvasuki Date: Sat, 31 Mar 2018 21:49:08 -0700 Subject: [PATCH 5/5] Add google-drive-ocamlfuse --- lilo | 12 ++++++++---- lilo.automode | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lilo b/lilo index 5f4c4005..5a86c036 100755 --- a/lilo +++ b/lilo @@ -1989,7 +1989,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 "" @@ -2041,9 +2042,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 index b89b82ea..619d1dfc 100755 --- a/lilo.automode +++ b/lilo.automode @@ -246,6 +246,7 @@ #11) uGet #12) youtube-dl #13) tixati + #14) tixati DOWNLOAD_OPTIONS="" #}}} #EMAIL|RSS {{{