From: Michael Tremer Date: Mon, 8 Oct 2012 12:48:03 +0000 (+0000) Subject: Add quote and unquote functions. X-Git-Tag: 006~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04854c77498faa4d4930d87678a3e6927247154d;p=network.git Add quote and unquote functions. --- diff --git a/functions.config b/functions.config index 9a50de66..8e1ab95d 100644 --- a/functions.config +++ b/functions.config @@ -113,16 +113,7 @@ function config_strip() { return ${EXIT_OK} fi - if [ "${var:0:1}" = "\"" ]; then - var=${var:1} - fi - - local last=$(( ${#var} - 1 )) - if [ ${last} -ge 0 ] && [ "${var:${last}:1}" = "\"" ]; then - var=${var:0:${last}} - fi - - print "${var}" + unquote "${var}" } function config_write() { diff --git a/functions.util b/functions.util index 96b83b51..68fac1b3 100644 --- a/functions.util +++ b/functions.util @@ -33,6 +33,25 @@ function args() { echo "$@" | xargs printf "%s\n" } +function unquote() { + local var="$@" + + if [ "${var:0:1}" = "\"" ]; then + var=${var:1} + fi + + local last=$(( ${#var} - 1 )) + if [ ${last} -ge 0 ] && [ "${var:${last}:1}" = "\"" ]; then + var=${var:0:${last}} + fi + + print "${var}" +} + +function quote() { + print "\"%s\"" "$@" +} + # Print a pretty error message function error() { echo -e " ${CLR_RED_B}ERROR${CLR_RESET} : $@" >&2