[SCM] live-build branch, debian-next, updated. debian/3.0_a31-1-12-g60cc074
Daniel Baumann
daniel at debian.org
Thu Sep 22 19:10:57 UTC 2011
The following commit has been merged in the debian-next branch:
commit 60cc074d9cd1a83a00032de3358f0c7d92787ae5
Author: Yaroslav Halchenko <debian at onerussian.com>
Date: Thu Sep 22 15:02:32 2011 -0400
Enclosing shell variables for iso-* defaults in escaped double-quotes while evaluating for the length to allow using parentheses.
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 796724e..53c7af9 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
--
live-build
More information about the debian-live-changes
mailing list