Added the ability to take a screenshot. Fixed doubled cpu speed on linux

This commit is contained in:
Dylan 2016-01-08 16:08:00 +11:00
parent 972d677da5
commit 329265f284
2 changed files with 44 additions and 0 deletions

View File

@ -122,6 +122,11 @@ Please report any bugs or issues you're having with this as I can't
to the top edge of the window to the top edge of the window
--clean Remove all cropped images --clean Remove all cropped images
Screenshot:
--scrot Take a screenshot
--scrotdir Directory to save the scrot
--scrotfile File name of scrot
Other: Other:
--help Print this text and exit --help Print this text and exit
``` ```

39
fetch
View File

@ -205,6 +205,27 @@ xoffset=0
# }}} # }}}
# Other Options {{{
# Take a screenshot
# --scrot on/off
scrot="off"
# Scrot dir
# Where to save the screenshots
# --scrotdir /path/to/screenshot/folder
scrotdir="$HOME/Pictures"
# Scrot filename
# What to name the screenshots
# --scrot
scrotname="fetch-%Y-%m-%d-%H:%M.png"
# }}}
# }}} # }}}
@ -436,6 +457,7 @@ getcpu () {
# Get cpu name # Get cpu name
cpu="$(grep -F 'model name' /proc/cpuinfo)" cpu="$(grep -F 'model name' /proc/cpuinfo)"
cpu=${cpu/model name*: /} cpu=${cpu/model name*: /}
cpu=${cpu/ @*/}
# Get cpu speed # Get cpu speed
speed_type=${speed_type/rent/} speed_type=${speed_type/rent/}
@ -740,6 +762,10 @@ getimage () {
img="$imgtempdir/$imgname" img="$imgtempdir/$imgname"
} }
takescrot () {
scrot -c -d 3 "$scrotdir/$scrotname"
}
# }}} # }}}
@ -844,6 +870,11 @@ usage () { cat << EOF
to the top edge of the window to the top edge of the window
--clean Remove all cropped images --clean Remove all cropped images
Screenshot:
--scrot Take a screenshot
--scrotdir Directory to save the scrot
--scrotfile File name of scrot
Other: Other:
--help Print this text and exit --help Print this text and exit
@ -912,6 +943,11 @@ while [ "$1" ]; do
--gap) gap="$2" ;; --gap) gap="$2" ;;
--clean) rm -rf "$imgtempdir" || exit ;; --clean) rm -rf "$imgtempdir" || exit ;;
# Screenshot
--scrot|-s) scrot="on" ;;
--scrotdir) scrot="$2" ;;
--scrotfile) scrot="$2" ;;
# Other # Other
--help) usage ;; --help) usage ;;
esac esac
@ -1031,6 +1067,9 @@ printinfo
# Move cursor to bottom and redisplay it. # Move cursor to bottom and redisplay it.
printf "%b%s" "\e[${lines}H\e[${prompt_height}A\e[?25h" printf "%b%s" "\e[${lines}H\e[${prompt_height}A\e[?25h"
# If enabled take a screenshot
[ "$scrot" == "on" ] && takescrot
# }}} # }}}