Bob Mottram 7 лет назад
Родитель
Сommit
0d1fa4e13e
1 измененных файлов: 7 добавлений и 7 удалений
  1. 7
    7
      src/freedombone-controlpanel

+ 7
- 7
src/freedombone-controlpanel Просмотреть файл

@@ -49,27 +49,27 @@ function please_wait {
49 49
 
50 50
 #please_wait
51 51
 
52
-max_files=0
52
+utils_files=0
53 53
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
54 54
 for f in $UTILS_FILES
55 55
 do
56
-    max_files=$((max_files + 1))
56
+    utils_files=$((utils_files + 1))
57 57
 done
58
+apps_files=0
58 59
 APP_FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
59 60
 for f in $APP_FILES
60 61
 do
61
-    max_files=$((max_files + 1))
62
+    apps_files=$((apps_files + 1))
62 63
 done
63 64
 
64 65
 
65 66
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
66 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 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 74
 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
75 75
 SELECTED_USERNAME=