diff --git a/wf-shadow b/wf-shadow index b256c5b..884296d 100755 --- a/wf-shadow +++ b/wf-shadow @@ -48,6 +48,10 @@ if [ -n "$NO_VIDEO" ]; then NO_VIDEO=" " fi +if [ -n "$VERBOSE" ]; then + VERBOSE=" " +fi + trap 'kill $(jobs -p) 2>/dev/null' EXIT trap 'exit' INT set -m @@ -107,18 +111,10 @@ record() { else SAVE_FILE="$(eval "$WF_SHADOW_SAVE")" fi - if [ -n "$VERBOSE" ]; then - if ffmpeg -nostdin -y -sseof -"$2" -i "$1" ${NO_VIDEO:-${VIDEO_CODEC:+-vcodec "$VIDEO_CODEC"}} ${NO_AUDIO:-${AUDIO_CODEC:+-acodec "$AUDIO_CODEC"}} ${NO_VIDEO:+-vn} ${NO_AUDIO:+-an} "$SAVE_FILE"; then - notify-send "Clip saved" "$2 second clip saved to $SAVE_FILE" - else - notify-send "Error saving clip" "Start a new session with --verbose to see ffmpeg output" - fi + if eval "ffmpeg -nostdin -y -sseof -'$2' -i '$1' ${NO_VIDEO:-${VIDEO_CODEC:+-vcodec "$VIDEO_CODEC"}} ${NO_AUDIO:-${AUDIO_CODEC:+-acodec "$AUDIO_CODEC"}} ${NO_VIDEO:+-vn} ${NO_AUDIO:+-an} '$SAVE_FILE' ${VERBOSE:-&>/dev/null}"; then + notify-send "Clip saved" "$2 second clip saved to $SAVE_FILE" else - if ffmpeg -nostdin -y -sseof -"$2" -i "$1" ${NO_VIDEO:-${VIDEO_CODEC:+-vcodec "$VIDEO_CODEC"}} ${NO_AUDIO:-${AUDIO_CODEC:+-acodec "$AUDIO_CODEC"}} ${NO_VIDEO:+-vn} ${NO_AUDIO:+-an} "$SAVE_FILE" &>/dev/null; then - notify-send "Clip saved" "$2 second clip saved to $SAVE_FILE" - else - notify-send "Error saving clip" "Start a new session with --verbose to see ffmpeg output" - fi + notify-send "Error saving clip" "Start a new session with --verbose to see ffmpeg output" fi } @@ -136,11 +132,7 @@ start() { fg || exit . "$RUNTIME"/"$MONITOR".env - case "$(if [ -n "$VERBOSE" ]; then - printf "$WOFI_STRING" | wofi --dmenu -i -H 500 -W 250 -x 0 -y 0 - else - printf "$WOFI_STRING" | wofi --dmenu -i -H 500 -W 250 -x 0 -y 0 &> /dev/null - fi)" in + case "$(eval "printf '$WOFI_STRING' | wofi --dmenu -i -H 500 -W 250 -x 0 -y 0 ${VERBOSE:-2>/dev/null}")" in '5 seconds') record "$i" 5 ;; '10 seconds') record "$i" 10 ;; @@ -219,7 +211,7 @@ until [ -z "$1" ]; do set -x shift 1 ;; '-v' | '--verbose') - VERBOSE="1" + VERBOSE=" " shift 1 ;; *) print_help ;; esac