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

Scrot: Quote unquoted var

This commit is contained in:
Dylan Araps 2016-12-12 17:59:54 +11:00
parent c92fb13c13
commit 9be91cd8e3
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
neofetch
View File

@ -88,6 +88,7 @@ get_distro() {
else else
# Source the os-release file # Source the os-release file
for file in /etc/os-release /usr/lib/os-release /etc/*release /usr/lib/*release; do for file in /etc/os-release /usr/lib/os-release /etc/*release /usr/lib/*release; do
# shellcheck disable=1090
source "$file" && break source "$file" && break
done done
@ -2392,22 +2393,22 @@ scrot_program() {
# falling back to OS specific screenshot tools. # falling back to OS specific screenshot tools.
if [[ -n "$DISPLAY" ]]; then if [[ -n "$DISPLAY" ]]; then
if [[ "$scrot_cmd" != "auto" ]] && type -p "$scrot_cmd" >/dev/null; then if [[ "$scrot_cmd" != "auto" ]] && type -p "$scrot_cmd" >/dev/null; then
scrot_program="$scrot_cmd" scrot_program=("$scrot_cmd")
elif type -p scrot >/dev/null; then elif type -p scrot >/dev/null; then
scrot_program="scrot" scrot_program=(scrot)
elif type -p maim >/dev/null; then elif type -p maim >/dev/null; then
scrot_program="maim" scrot_program=(maim)
elif type -p import >/dev/null; then elif type -p import >/dev/null; then
scrot_program="import -window root" scrot_program=(import -window root)
elif type -p imlib2_grab >/dev/null; then elif type -p imlib2_grab >/dev/null; then
scrot_program="imlib2_grab" scrot_program=(imlib2_grab)
elif type -p gnome-screenshot >/dev/null; then elif type -p gnome-screenshot >/dev/null; then
scrot_program="gnome-screenshot -f" scrot_program=(gnome-screenshot -f)
else else
err "Scrot: No screen capture tool found." err "Scrot: No screen capture tool found."
@ -2415,15 +2416,15 @@ scrot_program() {
fi fi
else else
case "$os" in case "$os" in
"Mac OS X") scrot_program="screencapture -S" ;; "Mac OS X") scrot_program=(screencapture -S) ;;
"Haiku") scrot_program="screenshot -s" ;; "Haiku") scrot_program=(screenshot -s) ;;
esac esac
fi fi
# Take the scrot. # Take the scrot.
$scrot_program "$1" "${scrot_program[@]}" "$1"
err "Scrot: Screen captured using $scrot_program" err "Scrot: Screen captured using ${scrot_program[0]}"
} }
# TEXT FORMATTING # TEXT FORMATTING