Browse Source

Include utils

Bob Mottram 8 years ago
parent
commit
d13ce3fea9
2 changed files with 21 additions and 3 deletions
  1. 16
    0
      src/freedombone
  2. 5
    3
      src/freedombone-utils-config

+ 16
- 0
src/freedombone View File

42
 
42
 
43
 source $PROJECT_INSTALL_DIR/${PROJECT_NAME}-vars
43
 source $PROJECT_INSTALL_DIR/${PROJECT_NAME}-vars
44
 
44
 
45
+UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
46
+for f in $UTILS_FILES
47
+do
48
+  source $f
49
+done
50
+
51
+APP_FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
52
+for f in $APP_FILES
53
+do
54
+  source $f
55
+done
56
+
45
 command_options=$1
57
 command_options=$1
46
 
58
 
47
 if [[ $command_options == "menuconfig-full" ]]; then
59
 if [[ $command_options == "menuconfig-full" ]]; then
237
         exit 0
249
         exit 0
238
     fi
250
     fi
239
 
251
 
252
+    read_config_param 'DEFAULT_DOMAIN_NAME'
253
+    read_config_param 'MY_USERNAME'
254
+    read_config_param 'SYSTEM_TYPE'
255
+
240
     if [ ! -d /home/$MY_USERNAME ]; then
256
     if [ ! -d /home/$MY_USERNAME ]; then
241
         echo $"There is no user '$MY_USERNAME' on the system. Use 'adduser $MY_USERNAME' to create the user."
257
         echo $"There is no user '$MY_USERNAME' on the system. Use 'adduser $MY_USERNAME' to create the user."
242
         exit 1
258
         exit 1

+ 5
- 3
src/freedombone-utils-config View File

31
 function read_config_param {
31
 function read_config_param {
32
     param_name="$1"
32
     param_name="$1"
33
 
33
 
34
-    if [ -f $CONFIGURATION_FILE ]; then
35
-        if grep -q "$param_name" $CONFIGURATION_FILE; then
36
-            $param_name=$(grep "$param_name" $CONFIGURATION_FILE | head -n 1 | awk -F '=' '{print $2}')
34
+    if [ $CONFIGURATION_FILE ]; then
35
+        if [ -f $CONFIGURATION_FILE ]; then
36
+            if grep -q "${param_name}" $CONFIGURATION_FILE; then
37
+                ${param_name}=$(cat $CONFIGURATION_FILE | grep "${param_name}=" | head -n 1 | awk -F '=' '{print $2}')
38
+            fi
37
         fi
39
         fi
38
     fi
40
     fi
39
 }
41
 }