From 332b689ec87540776737a917fcbf1557c1dc8866 Mon Sep 17 00:00:00 2001 From: Ian Mancini Date: Wed, 27 Jan 2021 15:33:18 -0300 Subject: [PATCH] Fix shellcheck issues and encoding in slop-ffmpeg-area --- slop-ffmpeg-area | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/slop-ffmpeg-area b/slop-ffmpeg-area index ed7a5cd..6180ea3 100755 --- a/slop-ffmpeg-area +++ b/slop-ffmpeg-area @@ -2,14 +2,14 @@ SCREENCAST_PID_FILE="$HOME/.screencast-pid" -if [ -f $SCREENCAST_PID_FILE ]; then - notify-send "Stopping screencast" - pid=$(cat $SCREENCAST_PID_FILE) - kill $pid - tail --pid=$pid -f /dev/null - rm $SCREENCAST_PID_FILE - notify-send "Screencast stopped" - exit 0 +if [ -f "$SCREENCAST_PID_FILE" ]; then + notify-send "Stopping screencast" + pid=$(cat "$SCREENCAST_PID_FILE") + kill "$pid" + tail --pid="$pid" -f /dev/null + rm "$SCREENCAST_PID_FILE" + notify-send "Screencast stopped" + exit 0 fi DIR="$HOME/Videos/screencasts/" @@ -19,16 +19,16 @@ FILENAME="$DIR$DATE.mp4" slop=$(slop -f "%x %y %w %h %g %i") || exit 1 [[ $? = 1 ]] && notify-send "Screencast cancelled" && exit 1 notify-send "Starting screencast" -touch $HOME/.screencast-pid -read -r X Y W H G ID < <(echo $slop) -((ffmpeg -y -f x11grab -s "$W"x"$H" -i :0.0+$X,$Y -f pulse -i 1 $FILENAME) & jobs -p > $SCREENCAST_PID_FILE) - -while [ -f $SCREENCAST_PID_FILE ]; do - sleep 1 +touch "$HOME/.screencast-pid" +# shellcheck disable=SC2034 +read -r X Y W H G ID < <(echo "$slop") +[ ! $((W%2)) -eq 0 ] && W=$((W-1)); [ ! $((H%2)) -eq 0 ] && H=$((H-1)) +( (ffmpeg -y -f x11grab -s "$W"x"$H" -i :0.0+"$X","$Y" -f pulse -i 1 -vf format=yuv420p -profile:v baseline "$FILENAME") & jobs -p > "$SCREENCAST_PID_FILE" ) + +while [ -f "$SCREENCAST_PID_FILE" ]; do + sleep 1 done # xclip -selection clipboard -t video/mp4 "$FILENAME" -dragon-drag-and-drop $FILENAME +dragon-drag-and-drop "$FILENAME" notify-send "Saved screencast" "$DATE.mp4" - -