Browse Source

Try calling function for source

Bob Mottram 7 years ago
parent
commit
2f58ceebf6
1 changed files with 6 additions and 2 deletions
  1. 6
    2
      src/freedombone-controlpanel

+ 6
- 2
src/freedombone-controlpanel View File

@@ -47,6 +47,10 @@ function please_wait {
47 47
         echo -n ''
48 48
 }
49 49
 
50
+function include_source {
51
+    source $1
52
+}
53
+
50 54
 #please_wait
51 55
 
52 56
 utils_files=0
@@ -65,11 +69,11 @@ done
65 69
 
66 70
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
67 71
 file_ctr=0
68
-for f in $UTILS_FILES; do echo "$((file_ctr * 100 / utils_files))"; source $f; file_ctr=$((file_ctr + 1)); done | dialog --gauge $"Loading utilities" 7 70 0
72
+for f in $UTILS_FILES; do echo "$((file_ctr * 100 / utils_files))"; include_source $f; file_ctr=$((file_ctr + 1)); done | dialog --gauge $"Loading utilities" 7 70 0
69 73
 
70 74
 APP_FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
71 75
 file_ctr=0
72
-for f in $APP_FILES; do echo "$((file_ctr * 100 / apps_files))"; source $f; file_ctr=$((file_ctr + 1)); done | dialog --gauge $"Loading apps" 7 70 0
76
+for f in $APP_FILES; do echo "$((file_ctr * 100 / apps_files))"; include_source $f; file_ctr=$((file_ctr + 1)); done | dialog --gauge $"Loading apps" 7 70 0
73 77
 
74 78
 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
75 79
 SELECTED_USERNAME=