From 6bb9442c4334ffce0bd9fa7e533495efb77e6b12 Mon Sep 17 00:00:00 2001
From: AnthonyAxenov <anthonyaxenov@gmail.com>
Date: Tue, 5 Jul 2022 10:53:41 +0800
Subject: [PATCH] Small updates

---
 Makefile                        | 34 +++++++++++++++++++++++++++++----
 README.md                       | 28 +++++++++++++++++++--------
 gen-makefile.sh => gen-makefile |  0
 3 files changed, 50 insertions(+), 12 deletions(-)
 rename gen-makefile.sh => gen-makefile (100%)

diff --git a/Makefile b/Makefile
index 5f89fe3..590b553 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,14 @@
-# Autogenerated at 04.07.2022 23:52 using ./gen-makefile.sh
+# Autogenerated at 05.07.2022 10:52 using ./gen-makefile
 
-##lamp: Apache + php + mariadb
+##flameshot: [TODO] [PACK] qt5 + flameshot from source
+flameshot: qt5 flameshot-build
+
+##lamp: [PACK] Apache + php + mariadb
 lamp: apache php mariadb
 
+##omz: [PACK] zsh + omz + powerline10k + MesloLGS fonts
+omz: zsh omz-clean
+
 ##apache: Install apache2 (latest)
 apache:
 	./install/apache
@@ -31,6 +37,10 @@ droidcam:
 droidcam-obs:
 	./install/droidcam-obs
 
+##flameshot-build: [TODO] Build flameshot from src (latest)
+flameshot-build:
+	./install/flameshot-build
+
 ##git: Install git (latest)
 git:
 	./install/git
@@ -47,6 +57,10 @@ grubc:
 kde-appmenu:
 	./install/kde-appmenu
 
+##libreoffice: Install libreoffice
+libreoffice:
+	./install/libreoffice
+
 ##lite-xl: Install lite-xl v2.0.5 (draft)
 lite-xl:
 	./install/lite-xl
@@ -59,6 +73,14 @@ mariadb:
 nodejs:
 	./install/nodejs
 
+##omz-clean: Install omz (latest) + powerline10k + MesloLGS fonts
+omz-clean:
+	./install/omz-clean
+
+##papirus: Install papirus-icon-theme (latest)
+papirus:
+	./install/papirus
+
 ##pgsql: Install postgresql (latest) and php-pgsql (if php is installed)
 pgsql:
 	./install/pgsql
@@ -71,7 +93,11 @@ php:
 postman:
 	./install/postman
 
-##rustdesk: Install rustdesk v1.1.8 (deb)
+##qt5: Install qt5
+qt5:
+	./install/qt5
+
+##rustdesk: Install rustdesk client v1.1.9 (deb)
 rustdesk:
 	./install/rustdesk
 
@@ -99,7 +125,7 @@ wine:
 zint:
 	./install/zint
 
-##zsh: Install zsh + omz (latest)
+##zsh: Install vanilla zsh
 zsh:
 	./install/zsh
 
diff --git a/README.md b/README.md
index ff841cd..4ac0a55 100644
--- a/README.md
+++ b/README.md
@@ -4,11 +4,14 @@
 
 ## Requirements
 
+* Ubuntu >= 20.04 (not tested with version < 20)
 * `bash`, `zsh` or other `sh`-compatible shell
 * `make` (optional but recommended)
 * `wget` (necessary for some scripts)
 * `git` (necessary for some scripts)
 
+If some dependecies are missed for some of these scripts it is enougth to run `./install/apt` in most cases.
+
 ## Usage
 
 ### Clone this repo (recommended)
@@ -23,36 +26,37 @@ wget -qO - https://git.axenov.dev/anthony/my-env/archive/master.tar.gz | tar -zx
 # switch to repo dir
 cd my-env
 
+# generate fresh ./Makefile and get full list of `make` goals
+./gen-makefile
+
 # get full list of `make` goals
 make help
-
-# generate new ./Makefile and get full list of `make` goals
-./gen-makefile.sh
 ```
 
-> I do not recomend to run `make` without arguments.
+> I do not recommend to run `make` without arguments since then ALL goals will be started in their order.
+> 
 > Use `make help` to look around.
 
 ### Selective straightforward installation
 
 ```shell
 # from remote file
-wget -qO - https://git.axenov.dev/anthony/my-env/raw/branch/master/install/apt.sh | bash
+wget -qO - https://git.axenov.dev/anthony/my-env/raw/branch/master/install/apt | bash
 
 # from locally cloned repo
-./install/apt.sh
+./install/apt
 ```
 
 ## How to add a new software script?
 
-1. Create new `./install/*.sh` script.  
+1. Create new `./install/*` script.  
    At the beggining of a file you must write these two lines:
    ```shell
    #!/bin/bash
    ##makedesc: Your description for Makefile
    ```
 2. Test your script
-3. Run `./gen-makefile.sh` to generate new `./Makefile`
+3. Run `./gen-makefile` to generate new `./Makefile`
 
 ## How to create packs?
 
@@ -97,6 +101,14 @@ docker run -it $(docker build -q .)
 
 Now you can play around with scripts.
 
+## TODO
+
+* build: [flameshot](https://github.com/flameshot-org/flameshot#compilation)
+* build: [rustdesk](https://github.com/rustdesk/rustdesk#build)
+* [JB mono](https://www.jetbrains.com/ru-ru/lp/mono/#how-to-install) ([2](https://fonts.google.com/specimen/JetBrains+Mono))
+* update scripts (when possible)
+* uninstall scripts (when possible)
+
 ## License
 
 [WTFPLv2](LICENSE)
diff --git a/gen-makefile.sh b/gen-makefile
similarity index 100%
rename from gen-makefile.sh
rename to gen-makefile