summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorYaroslav Halchenko <debian@onerussian.com>2011-09-22 15:02:32 -0400
committerDaniel Baumann <daniel@debian.org>2011-09-22 21:11:31 +0200
commit365a0c2062415bdbc020d4e5a4288c249bc483e0 (patch)
tree42388631136ffad06c6fe78b517549596508f279 /functions
parent3eeac2e0bed8a230658710a7a806a7001f6da4c2 (diff)
downloadvyos-live-build-365a0c2062415bdbc020d4e5a4288c249bc483e0.tar.gz
vyos-live-build-365a0c2062415bdbc020d4e5a4288c249bc483e0.zip
Enclosing shell variables for iso-* defaults in escaped double-quotes while evaluating for the length to allow using parentheses (Closes: #642463).
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/defaults.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 796724e90..53c7af999 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -1218,22 +1218,22 @@ Check_defaults ()
;;
esac
- if [ "$(echo ${LB_ISO_APPLICATION} | wc -c)" -gt 128 ]
+ if [ "$(echo \"${LB_ISO_APPLICATION}\" | wc -c)" -gt 128 ]
then
Echo_warning "You have specified a value of LB_ISO_APPLICATION that is too long; the maximum length is 128 characters."
fi
- if [ "$(echo ${LB_ISO_PREPARER} | wc -c)" -gt 128 ]
+ if [ "$(echo \"${LB_ISO_PREPARER}\" | wc -c)" -gt 128 ]
then
Echo_warning "You have specified a value of LB_ISO_PREPARER that is too long; the maximum length is 128 characters."
fi
- if [ "$(echo ${LB_ISO_PUBLISHER} | wc -c)" -gt 128 ]
+ if [ "$(echo \"${LB_ISO_PUBLISHER}\" | wc -c)" -gt 128 ]
then
Echo_warning "You have specified a value of LB_ISO_PUBLISHER that is too long; the maximum length is 128 characters."
fi
- if [ "$(eval "echo ${LB_ISO_VOLUME}" | wc -c)" -gt 32 ]
+ if [ "$(eval "echo \"${LB_ISO_VOLUME}\"" | wc -c)" -gt 32 ]
then
Echo_warning "You have specified a value of LB_ISO_VOLUME that is too long; the maximum length is 32 characters."
fi