Merge branch 'master' of https://github.com/jorgevasquezp/my_scripts

bash/fix_wacom.sh

@@ -1,7 +1,8 @@
 #casa
 #wacom_id=10
 #makine
-wacom_id="Wacom Intuos Pro M Pen stylus"
+#wacom_id="Wacom Intuos Pro M Pen stylus"
+wacom_id=$(xsetwacom --list devices | grep stylus | grep -o [0-9].)
 xsetwacom --set "$wacom_id" button 2 3
 xsetwacom --set "$wacom_id" button 3 2
 

bash/grab_screen.sh

@@ -0,0 +1,2 @@
+#requires scrot
+scrot '%Y-%m-%d_$wx$h_scrot.png' -e 'mv $f ~/Pictures/'

bash/grab_window.sh

@@ -0,0 +1,2 @@
+#requires scrot
+scrot '%Y-%m-%d_$wx$h_scrot.png' -u -e 'mv $f ~/Pictures/'

bash/make_anim+.sh

@@ -2,5 +2,5 @@
 bg_color=#5d5d5d
 size=1920x1080
 for i;
-do ffmpeg -f lavfi -i color=c=$bg_color:s=$size -start_number 0001 -i $i%04d.png -filter_complex "[0:v][1:v]overlay=shortest=1,format=yuv420p[out]" -map "[out]" -c:v qtrle -q 0 $i"_Animation+.mov";
+do ffmpeg -f lavfi -r 23.976 -i color=c=$bg_color:s=$size -start_number 0001 -r 23.976 -i $i%04d.png -filter_complex "[0:v][1:v]overlay=shortest=1,format=yuv420p[out]" -map "[out]" -c:v qtrle -q 0 $i"_Animation+.mov";
 done

bash/mount_pegasus.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+sudo mount.cifs //mak-nas/pegasus /Volumes/pegasus -o username=eduardo,password=pgss@1046,domain=intra.makinestudios.com

bash/ytdlpl.sh

@@ -1,8 +1,8 @@
 export IFS=$'\n';
 for i;
 	do 
-		youtube-dl -o "%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s" -f bestaudio "$i"
-		#youtube-dl -o "%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s" -f bestvideo+bestaudio "$i"
+		#youtube-dl -o "%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s" -f bestaudio "$i"
+		youtube-dl -o "%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s" -f bestvideo+bestaudio "$i"
 done;