From 317f635b91ff94659d85df427dc84fa62abab133 Mon Sep 17 00:00:00 2001
From: AnthonyAxenov <anthonyaxenov@gmail.com>
Date: Mon, 4 Jul 2022 22:12:37 +0800
Subject: [PATCH] Updated docker, apt, wine, snap; removed todo

---
 Makefile                              | 63 ++++++++++++---------------
 README.md                             |  7 +--
 install/apt                           |  6 +--
 install/docker                        | 28 +++++++-----
 install/snap                          |  2 +-
 install/todo/flatpak.sh_              | 12 -----
 install/todo/oci8.sh_                 | 47 --------------------
 install/todo/phpstorm-url-handler.sh_ | 42 ------------------
 install/todo/wkhtmltopdf.sh_          | 12 -----
 install/wine                          |  2 +-
 10 files changed, 56 insertions(+), 165 deletions(-)
 delete mode 100755 install/todo/flatpak.sh_
 delete mode 100644 install/todo/oci8.sh_
 delete mode 100644 install/todo/phpstorm-url-handler.sh_
 delete mode 100755 install/todo/wkhtmltopdf.sh_

diff --git a/Makefile b/Makefile
index bc9102e..5399f3f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,111 +1,106 @@
-# Autogenerated at 04.07.2022 19:25 using ./gen-makefile.sh
+# Autogenerated at 04.07.2022 22:11 using ./gen-makefile.sh
 
 ##lamp: Apache + php + mariadb
 lamp: apache php mariadb
-
 ##apache: Install apache2 (latest)
 apache:
 	./install/apache
 
 ##apt: Install bunch of software from apt
 apt:
-	./install/apt.sh
+	./install/apt
 
 ##chrome: Install google chrome (latest)
 chrome:
-	./install/chrome.sh
+	./install/chrome
 
 ##composer: Install composer (latest)
 composer:
-	./install/composer.sh
+	./install/composer
 
 ##docker: Install docker (latest) + docker-compose (latest) + ppa
 docker:
-	./install/docker.sh
-
-##droidcam-obs: Install droidcam-obs plugin v1.5.1
-droidcam-obs:
-	./install/droidcam-obs.sh
+	./install/docker
 
 ##droidcam: Install droidcam v1.8.2
 droidcam:
-	./install/droidcam.sh
+	./install/droidcam
+
+##droidcam-obs: Install droidcam-obs plugin v1.5.1
+droidcam-obs:
+	./install/droidcam-obs
 
 ##git: Install git (latest)
 git:
-	./install/git.sh
+	./install/git
 
 ##golang: Install golang v1.18.3
 golang:
-	./install/golang.sh
+	./install/golang
 
 ##grubc: Install grub-customizer (latest) + ppa
 grubc:
-	./install/grubc.sh
+	./install/grubc
 
 ##kde-appmenu: Install KDE Window AppMenu Applet
 kde-appmenu:
-	./install/kde-appmenu.sh
+	./install/kde-appmenu
 
 ##lite-xl: Install lite-xl v2.0.5 (draft)
 lite-xl:
-	./install/lite-xl.sh
+	./install/lite-xl
 
 ##mariadb: Install mariadb (latest) and php-mysql + phpMyAdmin (if php is installed)
 mariadb:
-	./install/mariadb.sh
+	./install/mariadb
 
 ##nodejs: Install nodejs + npm via nvm
 nodejs:
-	./install/nodejs.sh
+	./install/nodejs
 
 ##pgsql: Install postgresql (latest) and php-pgsql (if php is installed)
 pgsql:
-	./install/pgsql.sh
+	./install/pgsql
 
 ##php: Install php v8.1 + ppa
 php:
-	./install/php.sh
+	./install/php
 
 ##postman: Install postman (latest)
 postman:
-	./install/postman.sh
+	./install/postman
 
 ##rustdesk: Install rustdesk v1.1.8 (deb)
 rustdesk:
-	./install/rustdesk.sh
+	./install/rustdesk
 
 ##snap: Install bunch of software from snap
 snap:
-	./install/snap.sh
+	./install/snap
 
 ##syncthing: Install syncthing (latest) + ppa
 syncthing:
-	./install/syncthing.sh
+	./install/syncthing
 
 ##telebit: Install telebit (latest)
 telebit:
-	./install/telebit.sh
-
-##todo: <no description>
-todo:
-	./install/todo
+	./install/telebit
 
 ##ulauncher: Install ulauncher (latest) + ppa
 ulauncher:
-	./install/ulauncher.sh
+	./install/ulauncher
 
-##wine: Installwine (latest) + ppa (focal)
+##wine: Install wine (latest) + ppa (focal)
 wine:
-	./install/wine.sh
+	./install/wine
 
 ##zint: Install zint (latest)
 zint:
-	./install/zint.sh
+	./install/zint
 
 ##zsh: Install zsh + omz (latest)
 zsh:
-	./install/zsh.sh
+	./install/zsh
 
 ##help: Show this help message
 help: Makefile
diff --git a/README.md b/README.md
index ed9c3fb..113895d 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,12 @@
 
 `make`-ready bunch of scripts for easily installation of different software.
 
-## Prerequisites
+## Requirements
 
 * `bash`, `zsh` or other `sh`-compatible shell
-* `make`
-* `git` or `wget`
+* `make` (optional but recommended)
+* `wget` (necessary for some scripts)
+* `git` (necessary for some scripts)
 
 ## Usage
 
diff --git a/install/apt b/install/apt
index db30228..df214ea 100755
--- a/install/apt
+++ b/install/apt
@@ -25,7 +25,6 @@ sudo apt install -y --autoremove \
     gettext \
     gnupg \
     ubuntu-restricted-extras \
-    gnome-software \
     unzip \
     mc \
     htop \
@@ -46,7 +45,8 @@ sudo apt install -y --autoremove \
     net-tools \
     nmap \
     p7zip-full \
-    sqlitebrowser \
+    sqlitebrowser
+    # gnome-software \
     # minder \
     # redshift \
     # redshift-gtk \
@@ -57,4 +57,4 @@ sudo apt install -y --autoremove \
     # etckeeper \
     # deepin-screenshot \
     # geoclue-2.0 \
-    at
+    # at
diff --git a/install/docker b/install/docker
index 8fb71e0..9e49e33 100755
--- a/install/docker
+++ b/install/docker
@@ -9,18 +9,26 @@ echo
 
 # https://docs.docker.com/engine/install/ubuntu/
 
-# curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-# sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu focal stable"
-# sudo apt update
-# sudo apt install -y --autoremove docker-ce docker-compose
-
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+sudo apt remove -y docker docker-engine docker.io containerd runc
+sudo apt-get install \
+  ca-certificates \
+  curl \
+  gnupg \
+  lsb-release
+sudo mkdir -p /etc/apt/keyrings
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
 echo \
-  "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
+  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
   $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+sudo chmod a+r /etc/apt/keyrings/docker.gpg
 sudo apt update
-sudo apt install -y --autoremove docker-ce docker-ce-cli containerd.io
-
+sudo apt install -y --autoremove \
+  docker-ce \
+  docker-ce-cli \
+  containerd.io \
+  docker-compose-plugin \
+  docker-compose
 sudo usermod -aG docker anthony
-
+echo
 echo "You need to logout and log in again to apply docker group"
+echo
diff --git a/install/snap b/install/snap
index fcaed96..0bd5723 100755
--- a/install/snap
+++ b/install/snap
@@ -39,6 +39,6 @@ snapi peek
 # sudo ln -s /snap/bin/certbot /usr/bin/certbot
 
 # snapi mysql-workbench-community
-# snapi dbeaver-ce
+snapi dbeaver-ce
 # snapi discord
 # snapi obs-studio
diff --git a/install/todo/flatpak.sh_ b/install/todo/flatpak.sh_
deleted file mode 100755
index 11d0b40..0000000
--- a/install/todo/flatpak.sh_
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-echo
-echo "==============================================="
-echo "Installing flatpak and its software..."
-echo "==============================================="
-echo
-
-sudo apt install -y --autoremove \
-    flatpak \
-    gnome-software-plugin-flatpak
-
-flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
diff --git a/install/todo/oci8.sh_ b/install/todo/oci8.sh_
deleted file mode 100644
index a2f8c41..0000000
--- a/install/todo/oci8.sh_
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-echo
-echo "==============================================="
-echo "Installing oci8..."
-echo "==============================================="
-echo
-
-#check for
-# wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-basic-linuxx64.zip
-# wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip -- only libociicus.so
-# wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-sqlplus-linuxx64.zip
-# wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-tools-linuxx64.zip
-# wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip
-#unzip
-
-sudo mkdir /opt/oracle/
-sudo mv ~/Downloads/instant_client/ /opt/oracle/
-
-sudo sh -c "echo /opt/oracle/instant_client > /etc/ld.so.conf.d/oracle-instantclient.conf"
-sudo ldconfig
-
-sudo apt install -y --autoremove \
-    php-dev \
-    php-pear \
-    build-essential \
-    libaio1 \
-    default-jdk
-sudo pecl channel-update pecl.php.net
-sudo pecl install oci8 # php8
-#sudo pecl install oci8-2.2.0 # php7
-
-#sh -c "echo '; priority=10' > /etc/php/7.4/mods-available/oci8.ini"
-# sudo sh -c "echo 'extension=oci8.so' >> /etc/php/7.4/mods-available/oci8.ini"
-# sudo chmod 0644 /etc/php/7.4/mods-available/oci8.ini
-sudo phpenmod oci8
-php -i | grep oci8
-
-# instantclient,/opt/oracle/instant_client
-
-
-
-
-
-
-
-# https://pecl.php.net/package/oci8
-#sudo pecl install oci8-2.2.0
diff --git a/install/todo/phpstorm-url-handler.sh_ b/install/todo/phpstorm-url-handler.sh_
deleted file mode 100644
index f3dd8d6..0000000
--- a/install/todo/phpstorm-url-handler.sh_
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-echo
-echo "==============================================="
-echo "Installing phpstorm-url-handler..."
-echo "==============================================="
-echo
-
-installed() {
-    command -v "$1" >/dev/null 2>&1
-}
-
-# https://github.com/rozwell/phpstorm-url-handler/
-# https://askubuntu.com/a/1023143
-# https://askubuntu.com/a/919825
-# https://medium.com/swlh/custom-protocol-handling-how-to-8ac41ff651eb
-# https://www.linuxquestions.org/questions/linux-desktop-74/xdg-open-doesn%27t-recognize-custom-protocol-4175433062/#post4809984
-
-sudo rm -rf /usr/bin/phpstorm-url-handler >/dev/null
-sudo rm -rf ~/.local/share/applications/phpstorm-url-handler.desktop >/dev/null
-sudo rm -rf /usr/share/applications/phpstorm-url-handler.desktop >/dev/null
-if installed "git"; then
-    sudo git clone https://github.com/rozwell/phpstorm-url-handler.git /usr/src/phpstorm-url-handler
-else
-    sudo wget https://github.com/rozwell/phpstorm-url-handler/archive/master.zip -O /tmp/phpstorm-url-handler.zip
-    sudo unzip /tmp/phpstorm-url-handler.zip -d /usr/src/phpstorm-url-handler
-    sudo rm -f /tmp/phpstorm-url-handler.zip
-fi
-
-info "Copy .desktop"
-sudo cp /usr/src/phpstorm-url-handler/phpstorm-url-handler.desktop /usr/share/local/applications/phpstorm-url-handler.desktop
-
-info "Symlink bin"
-sudo cp /usr/src/phpstorm-url-handler/phpstorm-url-handler /usr/bin/phpstorm-url-handler
-
-info "desktop-file-install"
-sudo desktop-file-install phpstorm-url-handler.desktop
-
-info "update-desktop-database"
-sudo update-desktop-database -v 2>&1 | grep -E "^(.+)\/phpstorm-url-handler.desktop(.+)$"
-
-info "xdg-mime"
-xdg-mime default phpstorm-url-handler.desktop x-scheme-handler/phpstorm
diff --git a/install/todo/wkhtmltopdf.sh_ b/install/todo/wkhtmltopdf.sh_
deleted file mode 100755
index 7a17438..0000000
--- a/install/todo/wkhtmltopdf.sh_
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-echo
-echo "==============================================="
-echo "Installing wkhtmltopdf..."
-echo "==============================================="
-echo
-
-# не тестировалось
-
-wget "https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb" -O /tmp/wkhtmltopdf.deb
-sudo dpkg -i /tmp/wkhtmltopdf.deb
-rm /tmp/wkhtmltopdf.deb
diff --git a/install/wine b/install/wine
index 1106e88..053dc02 100755
--- a/install/wine
+++ b/install/wine
@@ -1,5 +1,5 @@
 #!/bin/bash
-##makedesc: Installwine (latest) + ppa (focal)
+##makedesc: Install wine (latest) + ppa (focal)
 
 echo
 echo "==============================================="