diff --git a/bin/sharpshot b/bin/sharpshot index 9516940..d9b511d 100755 --- a/bin/sharpshot +++ b/bin/sharpshot @@ -9,12 +9,12 @@ err() { NAME='sharpshot' SELF="${0:-$NAME}" VERSION='0.0.1' -OUTPUT_FILE="${SHARPSHOT_OUTPUT_FILE:-/tmp/sharpshot.png}" -COMMAND="${SHARPSHOT_COMMAND:-spectacle -b -o \"${OUTPUT_FILE}\"}" -COPY_COMMAND="${SHARPSHOT_COPY_COMMAND:-wl-copy}" -FULL_SWITCH="${SHARPSHOT_FULL_SWITCH:--f}" -ACTIVE_SWITCH="${SHARPSHOT_ACTIVE_SWITCH:--a}" -REGION_SWITCH="${SHARPSHOT_REGION_SWITCH:--r}" +OUTPUT_FILE=${SHARPSHOT_OUTPUT_FILE:-/tmp/sharpshot.png} +COMMAND=${SHARPSHOT_COMMAND:-spectacle -b -o ${OUTPUT_FILE}} +COPY_COMMAND=${SHARPSHOT_COPY_COMMAND:-wl-copy} +FULL_SWITCH=${SHARPSHOT_FULL_SWITCH:--f} +ACTIVE_SWITCH=${SHARPSHOT_ACTIVE_SWITCH:--a} +REGION_SWITCH=${SHARPSHOT_REGION_SWITCH:--r} VERBOSE=false DRY=false @@ -29,7 +29,7 @@ full() { if $DRY; then echo "DRY-RUN, would execute: '$COMMAND $FULL_SWITCH'" else - "$COMMAND" "$FULL_SWITCH" + $COMMAND "$FULL_SWITCH" & fi } @@ -38,7 +38,7 @@ active() { if $DRY; then echo "DRY-RUN, would execute: '$COMMAND $ACTIVE_SWITCH'" else - "$COMMAND" "$ACTIVE_SWITCH" + $COMMAND "$ACTIVE_SWITCH" & fi } @@ -47,20 +47,10 @@ region() { if $DRY; then echo "DRY-RUN, would execute: '$COMMAND $REGION_SWITCH'" else - "$COMMAND" "$REGION_SWITCH" + $COMMAND "$REGION_SWITCH" & fi } -copy() { - verbose 'Copying result file to clipboard' - if $DRY; then - echo "DRY-RUN, would execute: '$COPY_COMMAND < $OUTPUT_FILE'" - else - "$COPY_COMMAND" < "$OUTPUT_FILE" - fi - exit 0 -} - printversion() { echo "$NAME v$VERSION" } @@ -151,21 +141,6 @@ verbose "Active switch: $ACTIVE_SWITCH" verbose "Region switch: $REGION_SWITCH" verbose "Action: $ACTION" -out_dir="$(dirname "$OUTPUT_FILE")" -out_base="$(basename "$OUTPUT_FILE")" - -while read -r _ _ f; do - if [[ "$f" == "$out_base" ]]; then - copy - kill $BASHPID - fi -done < <(inotifywait -q -m -e create "$out_dir") & -inotify_pid=$! - -trap 'kill $inotify_pid' SIGINT - -verbose "Started inotifywait with PID $inotify_pid" - case "$ACTION" in a*) active @@ -178,10 +153,6 @@ case "$ACTION" in ;; *) err "Unknown capture mode '$ACTION'" - kill $inotify_pid exit 1 ;; esac - -verbose 'Waiting for file creation to happen' -wait $inotify_pid