From 85cf56afc5b794e8eefd5a8f23c5b6c8607437c1 Mon Sep 17 00:00:00 2001 From: fbt Date: Tue, 10 Feb 2015 16:54:55 +0300 Subject: [PATCH] Use printf instead of echo. exclude was unused. --- sup | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/sup b/sup index cf9bf28..06e3d95 100755 --- a/sup +++ b/sup @@ -13,11 +13,11 @@ cfg_screenshot_ext='png' [[ -f $HOME/.suprc ]] && { source "$HOME/.suprc"; } -sup.msg() { echo "[sup] $1"; } +sup.msg() { printf '%s\n' "[sup] $1"; } sup.err() { sup.msg "(error) $1" >&2; } sup.usage() { - echo "Usage: ${_self} [-RsF] [-D num] [file/url]" + printf '%s\n' "Usage: ${_self} [-RsF] [-D num] [file/url]" } sup.env() { @@ -45,7 +45,7 @@ sup.mktemp() { return 1 } - echo "$1" + printf '%s\n' "$1" } sup.scrot() { @@ -67,15 +67,10 @@ sup.scrot() { return 1 } - echo "$tmp_file" + printf '%s\n' "$tmp_file" } -sup.exclude() { - [[ "$2" ]] && { echo "$1"; return 1; } - return 0 -} - -sup.if_url() { echo "$1" | grep -oE "$cfg_url_regex" &>/dev/null; } +sup.if_url() { printf '%s\n' "$1" | grep -oE "$cfg_url_regex" &>/dev/null; } sup.mktemp() { declare tmp_file_name tmp_file_name_extra="$2" tmp_dir="$1" @@ -89,7 +84,7 @@ sup.mktemp() { tmp_file_name="${RANDOM}${RANDOM}${tmp_file_name_extra}" done - echo "${tmp_dir}/${tmp_file_name}" + printf '%s\n' "${tmp_dir}/${tmp_file_name}" } set_argv() {