Browse Source

Two progress bars

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

+ 7
- 7
src/freedombone-controlpanel View File

49
 
49
 
50
 #please_wait
50
 #please_wait
51
 
51
 
52
-max_files=0
52
+utils_files=0
53
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
53
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
54
 for f in $UTILS_FILES
54
 for f in $UTILS_FILES
55
 do
55
 do
56
-    max_files=$((max_files + 1))
56
+    utils_files=$((utils_files + 1))
57
 done
57
 done
58
+apps_files=0
58
 APP_FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
59
 APP_FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
59
 for f in $APP_FILES
60
 for f in $APP_FILES
60
 do
61
 do
61
-    max_files=$((max_files + 1))
62
+    apps_files=$((apps_files + 1))
62
 done
63
 done
63
 
64
 
64
 
65
 
65
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
66
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
66
 file_ctr=0
67
 file_ctr=0
67
-echo "0" | dialog --gauge $"Please wait" 7 70 0
68
-for f in $UTILS_FILES; do echo "$((file_ctr * 100 / max_files))"; source $f; file_ctr=$((file_ctr + 1)); done | dialog --gauge $"Please wait" 7 70 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
69
 
69
 
70
 APP_FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
70
 APP_FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
71
-for f in $APP_FILES; do echo "$((file_ctr * 100 / max_files))"; source $f; file_ctr=$((file_ctr + 1)); done | dialog --gauge $"Please wait" 7 70 0
72
-echo "100" | dialog --gauge $"Please wait" 7 70 0
71
+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
73
 
73
 
74
 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
74
 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
75
 SELECTED_USERNAME=
75
 SELECTED_USERNAME=