diff options
| -rwxr-xr-x | functions/configuration.sh | 40 | ||||
| -rwxr-xr-x | functions/defaults.sh | 30 |
2 files changed, 30 insertions, 40 deletions
diff --git a/functions/configuration.sh b/functions/configuration.sh deleted file mode 100755 index 70faa62a1..000000000 --- a/functions/configuration.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -## live-build(7) - System Build Scripts -## Copyright (C) 2016-2020 The Debian Live team -## Copyright (C) 2006-2015 Daniel Baumann <mail@daniel-baumann.ch> -## -## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -## This is free software, and you are welcome to redistribute it -## under certain conditions; see COPYING for details. - - -Get_configuration () -{ - local CONFIGURATION_FILE="${1}" - local FIELD_NAME="${2}" - local FIELD_BODY - - if [ -e "${CONFIGURATION_FILE}" ] - then - FIELD_BODY="$(grep ^${FIELD_NAME}: ${CONFIGURATION_FILE} | awk '{ $1=""; print $0 }' | sed -e 's|^ ||')" - fi - - echo ${FIELD_BODY} -} - -Set_configuration () -{ - local CONFIGURATION_FILE="${1}" - local FIELD_NAME="${2}" - local FIELD_BODY="${3}" - - if grep -qs "^${FIELD_NAME}:" "${CONFIGURATION_FILE}" - then - # Update configuration - sed -i -e "s|^${FIELD_NAME}:.*$|${FIELD_NAME}: ${FIELD_BODY}|" "${CONFIGURATION_FILE}" - else - # Append configuration - echo "${FIELD_NAME}: ${FIELD_BODY}" >> "${CONFIGURATION_FILE}" - fi -} diff --git a/functions/defaults.sh b/functions/defaults.sh index dd0ef9f77..47cc7c568 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -668,3 +668,33 @@ Validate_config () fi } + +Get_configuration () +{ + local CONFIGURATION_FILE="${1}" + local FIELD_NAME="${2}" + local FIELD_BODY + + if [ -e "${CONFIGURATION_FILE}" ] + then + FIELD_BODY="$(grep ^${FIELD_NAME}: ${CONFIGURATION_FILE} | awk '{ $1=""; print $0 }' | sed -e 's|^ ||')" + fi + + echo ${FIELD_BODY} +} + +Set_configuration () +{ + local CONFIGURATION_FILE="${1}" + local FIELD_NAME="${2}" + local FIELD_BODY="${3}" + + if grep -qs "^${FIELD_NAME}:" "${CONFIGURATION_FILE}" + then + # Update configuration + sed -i -e "s|^${FIELD_NAME}:.*$|${FIELD_NAME}: ${FIELD_BODY}|" "${CONFIGURATION_FILE}" + else + # Append configuration + echo "${FIELD_NAME}: ${FIELD_BODY}" >> "${CONFIGURATION_FILE}" + fi +} |