Browse Source

Show spinner

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

+ 10
- 32
src/freedombone-controlpanel View File

@@ -51,48 +51,26 @@ function include_source {
51 51
     source $1
52 52
 }
53 53
 
54
-#please_wait
54
+please_wait
55 55
 
56
-utils_files=0
56
+spin='-\|/'
57
+i=0
57 58
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
58 59
 for f in $UTILS_FILES
59 60
 do
60
-    utils_files=$((utils_files + 1))
61
+    i=$(( (i+1) %4 ))
62
+    printf "\r${spin:$i:1}"
63
+    source $f
61 64
 done
62
-apps_files=0
65
+
63 66
 APP_FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
64 67
 for f in $APP_FILES
65 68
 do
66
-    apps_files=$((apps_files + 1))
69
+    i=$(( (i+1) %4 ))
70
+    printf "\r${spin:$i:1}"
71
+    source $f
67 72
 done
68 73
 
69
-
70
-UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
71
-file_ctr=0
72
-dialog --title "$PROJECT_NAME" --gauge "Loading utils..." 7 75 < <(
73
-    for f in $UTILS_FILES
74
-    do
75
-        echo "$((file_ctr * 100 / utils_files))";
76
-cat <<EOF
77
-source $f
78
-EOF
79
-        file_ctr=$((file_ctr + 1))
80
-    done
81
-)
82
-
83
-APP_FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
84
-file_ctr=0
85
-dialog --title "$PROJECT_NAME" --gauge "Loading apps..." 7 75 < <(
86
-    for f in $APP_FILES
87
-    do
88
-        echo "$((file_ctr * 100 / apps_files))";
89
-cat <<EOF
90
-source $f
91
-EOF
92
-        file_ctr=$((file_ctr + 1))
93
-    done
94
-)
95
-
96 74
 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
97 75
 SELECTED_USERNAME=
98 76
 SIP_CONFIGURATION_FILE=/etc/sipwitch.conf