From 06352b30a69a53550b05c909832dc960d530d0fb Mon Sep 17 00:00:00 2001 From: Salt Date: Thu, 3 Jan 2019 21:43:30 -0600 Subject: [PATCH] xephwrap: Polish --- xephwrap | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/xephwrap b/xephwrap index eb50296..ea191d6 100755 --- a/xephwrap +++ b/xephwrap @@ -6,25 +6,27 @@ # Distributed under terms of the MIT license. # -name="$(basename $0 .sh)" +name="$(basename -- "$0" .sh)" -function log() { +log() { [ -z ${1+x} ] && return 1 - printf "\e[94m$name\e[0m: $1\n" + printf "\\e[94m%s\\e[0m: %s\\n" \ + "$name" \ + "$1" } -function xprompt() { +xprompt() { [ -z ${1+x} ] && return 2 [ -z ${2+x} ] || default="$2"; suffix=" [$default]" - read -p "$1$suffix: " + read -rp "$1$suffix: " if [ "$REPLY" == "" ]; then export REPLY="$2" fi } -function validatedep() { +validatedep() { [ -z ${1+x} ] && return 2 - if ! which "$1" > /dev/null 2>&1; then + if ! command -v "$1" > /dev/null 2>&1; then return 1 fi return 0