Merge branch 'master' of git.axenov.dev:anthony/my-env

Makefile

@@ -1,4 +1,4 @@
-# Autogenerated at 28.12.2022 14:46 using ./gen-makefile
+# Autogenerated at 01.02.2023 22:27 using ./gen-makefile
 .DEFAULT_GOAL := help
 
 #===============================================
@@ -234,7 +234,7 @@ phpstack: php phptools
 #	Scripts listed in ./uninstall
 #===============================================
 
-# Uninstall docker
+# Uninstall docker + ppa
 /docker:
 	@./uninstall/docker
 
@@ -246,6 +246,10 @@ phpstack: php phptools
 /omz:
 	@./uninstall/omz
 
+# Uninstall vivaldi + ppa
+/vivaldi:
+	@./uninstall/vivaldi
+
 #===============================================
 #	Service goals
 #===============================================
@@ -267,7 +271,7 @@ help: Makefile
 	@echo "\nAvailable GOALs:"
 	@sed -n 's/^##//p' $< | column -ts ':' | sed -e "s/^/\t/"
 +%:
-	@ 
+	@
 ^%:
 	@./upgrade/
 @%:

install/docker

@@ -9,26 +9,29 @@ echo
 
 # https://docs.docker.com/engine/install/ubuntu/
 
-sudo apt install \
-  ca-certificates \
-  curl \
-  gnupg \
-  lsb-release
+sudo apt install -y \
+    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
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg \
+| sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+
+sudo chmod a+r /etc/apt/keyrings/docker.gpg
+
 echo "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 \
-  docker-compose-plugin \
-  docker-compose
-sudo usermod -aG docker anthony
+    docker-ce \
+    docker-ce-cli \
+    containerd.io \
+    docker-compose-plugin
+
+sudo usermod -aG docker $(whoami)
 
 echo
 echo "Finish!"

uninstall/docker

@@ -1,21 +1,16 @@
 #!/bin/bash
-##makedesc: Uninstall docker
+##makedesc: Uninstall docker + ppa
 
 echo
 echo "==============================================="
-echo "Uninstalling docker..."
+echo "Uninstalling docker + ppa..."
 echo "==============================================="
 echo
 
-# sudo apt remove -y docker docker-engine docker.io containerd runc
-sudo apt remove -y \
-  containerd \
-  containerd.io \
-  docker \
-  docker-ce \
-  docker-ce-cli \
-  docker-compose \
-  docker-compose-plugin \
-  docker-engine \
-  docker.io \
-  runc
+sudo apt remove -y docker*
+
+rm -rf \
+    /etc/apt/sources.list.d/docker.list \
+    /etc/apt/keyrings/docker.gpg
+
+sudo apt update

uninstall/vivaldi

@@ -0,0 +1,16 @@
+#!/bin/bash
+##makedesc: Uninstall vivaldi + ppa
+
+echo
+echo "==============================================="
+echo "Uninstalling vivaldi + ppa..."
+echo "==============================================="
+echo
+
+sudo apt remove -y vivaldi-stable
+
+sudo rm -rf \
+    /usr/share/keyrings/vivaldi-browser.gpg \
+    /etc/apt/sources.list.d/vivaldi-archive.list
+
+sudo apt update