Fix bug in non-verbose mode where stdout from wofi was sent to /dev/null
Signed-off-by: Skylar "The Cobra" Widulski <cobra@vern.cc>
This commit is contained in:
parent
aa8fa3f733
commit
47664995a1
26
wf-shadow
26
wf-shadow
|
@ -48,6 +48,10 @@ if [ -n "$NO_VIDEO" ]; then
|
||||||
NO_VIDEO=" "
|
NO_VIDEO=" "
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -n "$VERBOSE" ]; then
|
||||||
|
VERBOSE=" "
|
||||||
|
fi
|
||||||
|
|
||||||
trap 'kill $(jobs -p) 2>/dev/null' EXIT
|
trap 'kill $(jobs -p) 2>/dev/null' EXIT
|
||||||
trap 'exit' INT
|
trap 'exit' INT
|
||||||
set -m
|
set -m
|
||||||
|
@ -107,18 +111,10 @@ record() {
|
||||||
else
|
else
|
||||||
SAVE_FILE="$(eval "$WF_SHADOW_SAVE")"
|
SAVE_FILE="$(eval "$WF_SHADOW_SAVE")"
|
||||||
fi
|
fi
|
||||||
if [ -n "$VERBOSE" ]; then
|
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
|
||||||
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"
|
||||||
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
|
|
||||||
else
|
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 "Error saving clip" "Start a new session with --verbose to see ffmpeg output"
|
||||||
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
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -136,11 +132,7 @@ start() {
|
||||||
fg || exit
|
fg || exit
|
||||||
. "$RUNTIME"/"$MONITOR".env
|
. "$RUNTIME"/"$MONITOR".env
|
||||||
|
|
||||||
case "$(if [ -n "$VERBOSE" ]; then
|
case "$(eval "printf '$WOFI_STRING' | wofi --dmenu -i -H 500 -W 250 -x 0 -y 0 ${VERBOSE:-2>/dev/null}")" in
|
||||||
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
|
|
||||||
|
|
||||||
'5 seconds') record "$i" 5 ;;
|
'5 seconds') record "$i" 5 ;;
|
||||||
'10 seconds') record "$i" 10 ;;
|
'10 seconds') record "$i" 10 ;;
|
||||||
|
@ -219,7 +211,7 @@ until [ -z "$1" ]; do
|
||||||
set -x
|
set -x
|
||||||
shift 1 ;;
|
shift 1 ;;
|
||||||
'-v' | '--verbose')
|
'-v' | '--verbose')
|
||||||
VERBOSE="1"
|
VERBOSE=" "
|
||||||
shift 1 ;;
|
shift 1 ;;
|
||||||
*) print_help ;;
|
*) print_help ;;
|
||||||
esac
|
esac
|
||||||
|
|
Loading…
Reference in New Issue