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

Makefile

@@ -1,4 +1,4 @@
-# Autogenerated at 29.09.2022 12:27 using ./gen-makefile
+# Autogenerated at 30.09.2022 14:05 using ./gen-makefile
 .DEFAULT_GOAL := help
 
 #===============================================
@@ -14,6 +14,9 @@ flameshot: qt5 flameshot-build
 # [PACK] Apache + php + mariadb
 lamp: apache php mariadb
 
+# [PACK] OBS Studio + droidcam-obs
+obs: obs-studio droidcam-obs
+
 # [PACK] zsh + omz + powerline10k + MesloLGS font
 omz: zsh omz-clean omz-fancy
 	chsh -s /usr/bin/zsh
@@ -103,6 +106,10 @@ nodejs:
 ntfy:
 	@./install/ntfy
 
+# Install obs-studio (latest snap)
+obs-studio:
+	@./install/obs-studio
+
 # Install omz (latest)
 omz-clean:
 	@./install/omz-clean

install/droidcam-obs

@@ -12,18 +12,20 @@ echo "Installing droidcam-obs..."
 echo "==============================================="
 echo
 
-command -v "obs" >/dev/null 2>&1 || echo 'You need to install obs first!'
+# command -v "obs" >/dev/null 2>&1 || echo 'You need to install obs first!'
+command -v "obs-studio" >/dev/null 2>&1 || echo 'You need to install obs-studio first!'
 
 mkdir -p ~/install/droidcam-obs
 wget -O /tmp/droidcam-obs.zip https://files.dev47apps.net/obs/droidcam_obs_1.5.1_linux.zip
 unzip -o /tmp/droidcam-obs.zip -d ~/install/droidcam-obs
 rm -rf /tmp/droidcam-obs.zip
 cd ~/install/droidcam-obs && ./install.sh
+sudo modprobe v4l2loopback video_nr=2 card_label="OBS Virtual Camera"
 
 echo
 echo "Don't forget to:"
 echo "1) restart OBS if it is running right now OR install (if not) and start it"
 echo "2) install android app: https://play.google.com/store/apps/developer?id=Dev47Apps"
-echo "3) If virtual camera not starting then execute:"
-echo "\tsudo modprobe v4l2loopback video_nr=2 card_label="OBS Virtual Camera""
+echo "3) if virtual camera not starting then execute:"
+echo -e "\tsudo modprobe v4l2loopback video_nr=2 card_label=\"OBS Virtual Camera\""
 echo

install/obs-studio

@@ -0,0 +1,10 @@
+#!/bin/bash
+##makedesc: Install obs-studio (latest snap)
+
+echo
+echo "==============================================="
+echo "Installing obs-studio (latest snap)..."
+echo "==============================================="
+echo
+
+sudo snap install obs-studio

packs/obs

@@ -0,0 +1,2 @@
+# [PACK] OBS Studio + droidcam-obs
+obs: obs-studio droidcam-obs