From e4e64a8ab1790c268320cedfc8da07c81c27c8ce Mon Sep 17 00:00:00 2001 From: AnthonyAxenov Date: Fri, 30 Sep 2022 14:06:16 +0800 Subject: [PATCH] obs pack and fixes --- Makefile | 9 ++++++++- install/droidcam-obs | 8 +++++--- install/obs-studio | 10 ++++++++++ packs/obs | 2 ++ 4 files changed, 25 insertions(+), 4 deletions(-) create mode 100755 install/obs-studio create mode 100644 packs/obs diff --git a/Makefile b/Makefile index 4a1f545..a56ce35 100644 --- a/Makefile +++ b/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 diff --git a/install/droidcam-obs b/install/droidcam-obs index 28ec827..872e2b6 100755 --- a/install/droidcam-obs +++ b/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 diff --git a/install/obs-studio b/install/obs-studio new file mode 100755 index 0000000..1280b7d --- /dev/null +++ b/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 diff --git a/packs/obs b/packs/obs new file mode 100644 index 0000000..37bcfed --- /dev/null +++ b/packs/obs @@ -0,0 +1,2 @@ +# [PACK] OBS Studio + droidcam-obs +obs: obs-studio droidcam-obs