Browse Source

merge config files; all setting can be overwritten by putting them into ezbuild.conf or ezsync.conf

belliash 7 years ago
parent
commit
1c9f883f15
4 changed files with 31 additions and 58 deletions
  1. 29
    0
      config/common.conf
  2. 0
    29
      config/ezbuild.conf
  3. 0
    29
      config/ezsync.conf
  4. 2
    0
      libraries/common

+ 29
- 0
config/common.conf View File

@@ -0,0 +1,29 @@
1
+# A time designation representing the time in seconds that you allow the connection to
2
+# the server to take. This only limits the connection phase, once curl has connected
3
+# this option is of no more use. Setting a timeout to 0 disables it altogether. Unless
4
+# you know what you are doing, it is best not to change the default timeout settings.
5
+FETCHTIMEOUT="180"
6
+
7
+# Sets the number of times EzBuild will attempt to download files and retrieve portage
8
+# and overlays before it exits with an error. This allows for a more successful retrieval
9
+# without user intervention most times.
10
+FETCHTRIES="3"
11
+
12
+# Specifies where EzBuild will store everything that it builds, and also where it will
13
+# put all its temporary files and caches.
14
+TEMPDIR="/var/tmp/ezbuild"
15
+
16
+# When enabled, causes EzBuild to save every information about progress and all executed
17
+# commands output in the log file. This might provide many useful information necessary
18
+# for debugging purposes.
19
+LOGGING="yes"
20
+
21
+# Using this, the default log date format can be changed according to the requirement.
22
+# This customizable format may be needed when you want to perform analysis on the logs
23
+# stored in the log file.
24
+LOGDATEFORMAT="%d/%m/%Y %H:%M:%S"
25
+
26
+# Specifies an e-mail address, where all notifications will be sent to. If this variable
27
+# is empty, none notification will be sent at all. This option requires logging to be
28
+# also enabled.
29
+NOTIFY=""

+ 0
- 29
config/ezbuild.conf View File

@@ -1,29 +0,0 @@
1
-# A time designation representing the time in seconds that you allow the connection to
2
-# the server to take. This only limits the connection phase, once curl has connected
3
-# this option is of no more use. Setting a timeout to 0 disables it altogether. Unless
4
-# you know what you are doing, it is best not to change the default timeout settings.
5
-FETCHTIMEOUT="180"
6
-
7
-# Sets the number of times EzBuild will attempt to download files and retrieve portage
8
-# and overlays before it exits with an error. This allows for a more successful retrieval
9
-# without user intervention most times.
10
-FETCHTRIES="3"
11
-
12
-# Specifies where EzBuild will store everything that it builds, and also where it will
13
-# put all its temporary files and caches.
14
-TEMPDIR="/var/tmp/ezbuild"
15
-
16
-# When enabled, causes EzBuild to save every information about progress and all executed
17
-# commands output in the log file. This might provide many useful information necessary
18
-# for debugging purposes.
19
-LOGGING="yes"
20
-
21
-# Using this, the default log date format can be changed according to the requirement.
22
-# This customizable format may be needed when you want to perform analysis on the logs
23
-# stored in the log file.
24
-LOGDATEFORMAT="%d/%m/%Y %H:%M:%S"
25
-
26
-# Specifies an e-mail address, where all notifications will be sent to. If this variable
27
-# is empty, none notification will be sent at all. This option requires logging to be
28
-# also enabled.
29
-NOTIFY=""

+ 0
- 29
config/ezsync.conf View File

@@ -1,29 +0,0 @@
1
-# A time designation representing the time in seconds that you allow the connection to
2
-# the server to take. This only limits the connection phase, once curl has connected
3
-# this option is of no more use. Setting a timeout to 0 disables it altogether. Unless
4
-# you know what you are doing, it is best not to change the default timeout settings.
5
-FETCHTIMEOUT="180"
6
-
7
-# Sets the number of times EzBuild will attempt to download files and retrieve portage
8
-# and overlays before it exits with an error. This allows for a more successful retrieval
9
-# without user intervention most times.
10
-FETCHTRIES="3"
11
-
12
-# Specifies where EzBuild will store everything that it builds, and also where it will
13
-# put all its temporary files and caches.
14
-TEMPDIR="/var/tmp/ezbuild"
15
-
16
-# When enabled, causes EzBuild to save every information about progress and all executed
17
-# commands output in the log file. This might provide many useful information necessary
18
-# for debugging purposes.
19
-LOGGING="yes"
20
-
21
-# Using this, the default log date format can be changed according to the requirement.
22
-# This customizable format may be needed when you want to perform analysis on the logs
23
-# stored in the log file.
24
-LOGDATEFORMAT="%d/%m/%Y %H:%M:%S"
25
-
26
-# Specifies an e-mail address, where all notifications will be sent to. If this variable
27
-# is empty, none notification will be sent at all. This option requires logging to be
28
-# also enabled.
29
-NOTIFY=""

+ 2
- 0
libraries/common View File

@@ -123,8 +123,10 @@ function isSet() {
123 123
 # Loads EzBuild configuration
124 124
 #-------------------------------------------------------------------------------
125 125
 function loadConfiguration() {
126
+	source ${EZROOT}/config/common.conf &> /dev/null || panic
126 127
 	source ${EZROOT}/config/${EZNAME}.conf &> /dev/null || panic
127 128
 	source ${EZROOT}/config/layout.conf &> /dev/null || panic
129
+	source /etc/ezbuild/common.conf &> /dev/null || panic
128 130
 	source /etc/ezbuild/${EZNAME}.conf &> /dev/null || panic
129 131
 	source /etc/ezbuild/layout.conf &> /dev/null || panic
130 132
 }

Loading…
Cancel
Save