EvolutionOS
/
neofetch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #162 from dylanaraps/scrot_fixes 

Fixed bugs with scrot usage
This commit is contained in:
Dylan Araps 2016-03-19 16:31:57 +11:00
parent 60ce0d14e5 cf3418d994
commit 0998d629d2
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/config
View File

@ -6,7 +6,7 @@
# Speed up script by not using unicode # Speed up script by not using unicode
export LC_ALL=C export LC_ALL=C
export LANG=c export LANG=C
export LANGUAGE=C export LANGUAGE=C
# Info Options {{{ # Info Options {{{
@ -368,12 +368,12 @@ scrot_cmd="scrot -c -d 3"
# Scrot dir # Scrot dir
# Where to save the screenshots # Where to save the screenshots
# --scrot_dir /path/to/screenshot/folder # --scrot_dir /path/to/screenshot/folder
scrot_dir="$HOME/Pictures" scrot_dir="$HOME/Pictures/"
# Scrot filename # Scrot filename
# What to name the screenshots # What to name the screenshots
# --scrot_name str # --scrot_name str
scrot_name="neofetch-%Y-%m-%d-%H:%M.png" scrot_name="neofetch-$(date +%F-%T).png"
# }}} # }}}

15
neofetch
View File

@ -388,12 +388,12 @@ scrot_cmd="scrot -c -d 3"
# Scrot dir # Scrot dir
# Where to save the screenshots # Where to save the screenshots
# --scrot_dir /path/to/screenshot/folder # --scrot_dir /path/to/screenshot/folder
scrot_dir="$HOME/Pictures" scrot_dir="$HOME/Pictures/"
# Scrot filename # Scrot filename
# What to name the screenshots # What to name the screenshots
# --scrot_name str # --scrot_name str
scrot_name="neofetch-%Y-%m-%d-%H:%M.png" scrot_name="neofetch-$(date +%F-%T).png"
# }}} # }}}
@ -2052,9 +2052,8 @@ getimage () {
img="$thumbnail_dir/$imgname" img="$thumbnail_dir/$imgname"
} }
scrot_path="$scrot_dir/$scrot_name"
takescrot () { takescrot () {
$scrot_cmd "$scrot_path" $scrot_cmd "${scrot_dir}${scrot_name}"
} }
# }}} # }}}
@ -2721,7 +2720,13 @@ while [ "$1" ]; do
--ascii_logo_size) ascii_logo_size="$2" ;; --ascii_logo_size) ascii_logo_size="$2" ;;
# Screenshot # Screenshot
--scrot | -s) scrot="on"; [ "$2" ] && scrot_path="$2" ;; --scrot | -s)
scrot="on"
if [ "$2" ]; then
scrot_name="${2##*/}"
scrot_dir="${2/$scrot_name}"
fi
;;
--scrot_cmd) scrot_cmd="$2" ;; --scrot_cmd) scrot_cmd="$2" ;;
# Stdout # Stdout