From a81ef5c0f9dad1e3cebaa5ed7681dd0e59e8cc28 Mon Sep 17 00:00:00 2001 From: Dylan Date: Sat, 23 Jan 2016 10:28:16 +1100 Subject: [PATCH] --scrot now takes a path/file --- README.md | 6 +++--- fetch | 15 +++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 52af58cb..afe65c55 100644 --- a/README.md +++ b/README.md @@ -239,10 +239,10 @@ alias fetch2="fetch \ --clean Remove all cropped images Screenshot: - --scrot Take a screenshot + --scrot /path/to/img Take a screenshot, if path is left empty + the screenshot function will use + \$scrot_dir and \$scrot_name. --scrot_cmd Screenshot program to launch - --scrot_dir Directory to save the scrot - --scrot_file File name of scrot Other: --help Print this text and exit diff --git a/fetch b/fetch index f0293426..8a225b78 100755 --- a/fetch +++ b/fetch @@ -256,7 +256,6 @@ xoffset=0 # Other Options {{{ -# Enable screenshot on script run # Whether or not to always take a screenshot # You can manually take a screenshot with "--scrot" or "-s" scrot="off" @@ -1100,8 +1099,9 @@ getimage () { img="$imgtempdir/$imgname" } +scrot_path="$scrot_dir/$scrot_name" takescrot () { - $scrot_cmd "$scrot_dir/$scrot_name" + $scrot_cmd "$scrot_path" } # }}} @@ -1272,10 +1272,10 @@ usage () { cat << EOF --clean Remove all cropped images Screenshot: - --scrot Take a screenshot + --scrot /path/to/img Take a screenshot, if path is left empty + the screenshot function will use + \$scrot_dir and \$scrot_name. --scrot_cmd Screenshot program to launch - --scrot_dir Directory to save the scrot - --scrot_file File name of scrot Other: --help Print this text and exit @@ -1352,10 +1352,9 @@ while [ "$1" ]; do --clean) rm -rf "$imgtempdir" || exit ;; # Screenshot - --scrot | -s) scrot="on" ;; + --scrot | -s) scrot="on"; \ + [ "$2" ] && scrot_path="$2" ;; --scrot_cmd) scrot_cmd="$2" ;; - --scrot_dir) scrot_dir="$2" ;; - --scrot_file) scrot_name="$2" ;; # Other --help) usage ;;