summaryrefslogtreecommitdiffstats
path: root/usr.sbin/pc-sysinstall
diff options
context:
space:
mode:
authorjpaetzel <jpaetzel@FreeBSD.org>2012-05-03 21:15:47 +0000
committerjpaetzel <jpaetzel@FreeBSD.org>2012-05-03 21:15:47 +0000
commitd728ab3a95d6a4675f32b283bd16f7496943b9f5 (patch)
treed31af731843aefb62beb5bb4e5abc6eb907b7620 /usr.sbin/pc-sysinstall
parenta742cb5d5497339bd5a29d5ad3d4ccb7a787336c (diff)
downloadFreeBSD-src-d728ab3a95d6a4675f32b283bd16f7496943b9f5.zip
FreeBSD-src-d728ab3a95d6a4675f32b283bd16f7496943b9f5.tar.gz
Fix parsing values which contain multiple "=" signs.
Submitted by: glarkin MFC after: 3 days Sponsored by: iXsystems
Diffstat (limited to 'usr.sbin/pc-sysinstall')
-rwxr-xr-xusr.sbin/pc-sysinstall/backend/functions-parse.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/pc-sysinstall/backend/functions-parse.sh b/usr.sbin/pc-sysinstall/backend/functions-parse.sh
index fecb018..ed0a3e6 100755
--- a/usr.sbin/pc-sysinstall/backend/functions-parse.sh
+++ b/usr.sbin/pc-sysinstall/backend/functions-parse.sh
@@ -33,7 +33,7 @@ get_value_from_string()
{
if [ -n "${1}" ]
then
- export VAL="`echo ${1} | cut -d '=' -f 2-15`"
+ export VAL="`echo ${1} | cut -d '=' -f 2-`"
else
echo "Error: Did we forgot to supply a string to parse?"
exit 1
@@ -45,7 +45,7 @@ get_value_from_cfg_with_spaces()
{
if [ -n "${1}" ]
then
- export VAL=`grep "^${1}=" ${CFGF} | head -n 1 | cut -d '=' -f 2-15`
+ export VAL=`grep "^${1}=" ${CFGF} | head -n 1 | cut -d '=' -f 2-`
else
exit_err "Error: Did we forgot to supply a setting to grab?"
fi
@@ -57,7 +57,7 @@ get_value_from_cfg()
{
if [ -n "${1}" ]
then
- export VAL=`grep "^${1}=" ${CFGF} | head -n 1 | cut -d '=' -f 2-15 | tr -d ' '`
+ export VAL=`grep "^${1}=" ${CFGF} | head -n 1 | cut -d '=' -f 2- | tr -d ' '`
else
exit_err "Error: Did we forgot to supply a setting to grab?"
fi
@@ -71,7 +71,7 @@ if_check_value_exists()
then
# Get the first occurrence of the setting from the config, strip out whitespace
- VAL=`grep "^${1}" ${CFGF} | head -n 1 | cut -d '=' -f 2 | tr -d ' '`
+ VAL=`grep "^${1}" ${CFGF} | head -n 1 | cut -d '=' -f 2- | tr -d ' '`
if [ -z "${VAL}" ]
then
# This value doesn't exist, lets return
@@ -104,7 +104,7 @@ check_value()
if [ -n "${1}" -a -n "${2}" ]
then
# Get the first occurrence of the setting from the config, strip out whitespace
- VAL=`grep "^${1}" ${CFGF} | head -n 1 | cut -d '=' -f 2 | tr -d ' '`
+ VAL=`grep "^${1}" ${CFGF} | head -n 1 | cut -d '=' -f 2- | tr -d ' '`
VALID="1"
for i in ${2}
do
@@ -133,7 +133,7 @@ file_sanity_check()
grep -q "^${i}=" $CFGF 2>/dev/null
if [ $? -eq 0 ]
then
- LN=`grep "^${i}=" ${CFGF} | head -n 1 | cut -d '=' -f 2 | tr -d ' '`
+ LN=`grep "^${i}=" ${CFGF} | head -n 1 | cut -d '=' -f 2- | tr -d ' '`
if [ -z "${LN}" ]
then
echo "Error: Config fails sanity test! ${i}= is empty"
OpenPOWER on IntegriCloud