From de926c698700e2362aa0f39c5d7b2d52961477e6 Mon Sep 17 00:00:00 2001
From: AnthonyAxenov <anthonyaxenov@gmail.com>
Date: Sat, 8 Jan 2022 13:26:21 +0800
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B1=D0=B0=20=D0=B1=D0=B5?=
 =?UTF-8?q?=D0=B7=20=D0=B4=D0=BE=D0=BF.=D1=81=D0=BA=D1=80=D0=B8=D0=BF?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install/000-apt.sh     | 16 +++++++++++-----
 install/001-snap.sh    | 23 ++++++++++++++++-------
 install/002-flatpak.sh | 10 +++++++---
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/install/000-apt.sh b/install/000-apt.sh
index 1001bd7..5faa40c 100755
--- a/install/000-apt.sh
+++ b/install/000-apt.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
-. "../src/01-common.sh" || exit 5
-title "Installing software from apt..."
+echo
+echo "==============================================="
+echo "Installing software from apt..."
+echo "==============================================="
+echo
 
-aptu
-aptug
-apti apt-transport-https \
+sudo apt update && sudo apt upgrade -y --autoremove
+sudo apt install -y --autoremove \
+    apt-transport-https \
     ca-certificates \
     curl \
     make \
@@ -39,6 +42,9 @@ apti apt-transport-https \
     lsp-plugins \
     lsb-release \
     net-tools \
+    nmap \
+    p7zip-full \
+    sqlitebrowser \
     # minder \
     # redshift \
     # redshift-gtk \
diff --git a/install/001-snap.sh b/install/001-snap.sh
index 9e3ee97..4cb0af4 100755
--- a/install/001-snap.sh
+++ b/install/001-snap.sh
@@ -1,11 +1,22 @@
 #!/bin/bash
-. "../src/01-common.sh" || exit 5
-title "Installing snap and its software..."
+echo
+echo "==============================================="
+echo "Installing flatpak and its software..."
+echo "==============================================="
+echo
+
+installed() {
+    command -v "$1" >/dev/null 2>&1
+}
+
+snapi() {
+    snap install $1 2>/dev/null
+    [[ $? -ne 0 ]] && snap install $1 --classic
+}
 
 if !installed snapd; then
-    aptu
-    apti snapd
-    apti gnome-software-plugin-snap
+    sudo apt update
+    sudo apt install -y --autoremove snapd gnome-software-plugin-snap
     # snapi core
     # snapi snapd
 else
@@ -32,6 +43,4 @@ sudo ln -s /snap/bin/certbot /usr/bin/certbot
 # snapi mysql-workbench-community
 # snapi dbeaver-ce
 # snapi discord
-# snapi liquibase
-# snapi postman
 # snapi obs-studio
diff --git a/install/002-flatpak.sh b/install/002-flatpak.sh
index 05898b3..11d0b40 100755
--- a/install/002-flatpak.sh
+++ b/install/002-flatpak.sh
@@ -1,8 +1,12 @@
 #!/bin/bash
-. "../src/01-common.sh" || exit 5
-title "Installing flatpak and its software..."
+echo
+echo "==============================================="
+echo "Installing flatpak and its software..."
+echo "==============================================="
+echo
 
-apti flatpak \
+sudo apt install -y --autoremove \
+    flatpak \
     gnome-software-plugin-flatpak
 
 flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo