[PATCH RFC 4/8] aiaiai-sh-functions: re-order options to match example config
Keller, Jacob E
jacob.e.keller at intel.com
Thu Mar 6 17:29:18 PST 2014
This patch re-orders the parsing for the standard configuration
variables, in order to match what is in our example configuration. It
also updates the header comment to match.
Signed-off-by: Jacob Keller <jacob.e.keller at intel.com>
---
email/aiaiai-email-sh-functions | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/email/aiaiai-email-sh-functions b/email/aiaiai-email-sh-functions
index f31581d98424..2e815bbf995d 100644
--- a/email/aiaiai-email-sh-functions
+++ b/email/aiaiai-email-sh-functions
@@ -139,11 +139,12 @@ ini_config_get_or_die()
# file:
#
# cfg_ownname, cfg_ownmail, cfg_adminname, cfg_adminmail, cfg_workdir,
-# cfg_jobs, cfg_signature, cfg_built_preamble.
+# cfg_jobs, cfg_preamble, cfg_signature, cfg_built_preamble
#
-# Additinally, the following variables are defined:
-# o cfg_preamble - contains the email preamble read from the file definded
-# in email.preamble variable
+# Additionally, the following variables are set:
+# o cfg_ownmail_local - the local portion of the ownmail address
+# o cfg_ownmail_domain - the domain portion of the ownmail address
+# o cfg_preamble - the contents of the file pointed to by the preamble file
#
# Usage: parse_config <cfgfile>
parse_config()
@@ -156,10 +157,11 @@ parse_config()
ini_config_get_or_die cfg_adminname "$cfgfile" "global" "adminname"
ini_config_get_or_die cfg_workdir "$cfgfile" "global" "workdir"
ini_config_get_or_die cfg_jobs "$cfgfile" "global" "jobs"
- ini_config_get_or_die cfg_signature "$cfgfile" "global" "signature"
ini_config_get_or_die cfg_preamble "$cfgfile" "global" "preamble"
+ ini_config_get_or_die cfg_signature "$cfgfile" "global" "signature"
ini_config_get_or_die cfg_built_preamble "$cfgfile" "global" "built_preamble"
+ # Get the contents of the preamble file
cfg_preamble="$(cat "$cfg_preamble")"
# Get the local and domain parts of own e-mail address
--
1.8.3.1
More information about the aiaiai
mailing list