From 0d1fa4e13e746f01a7bf20dc0332777583360016 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 11 Jun 2017 20:52:53 +0100 Subject: [PATCH] Two progress bars --- src/freedombone-controlpanel | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel index 456f11b7..f370f38a 100755 --- a/src/freedombone-controlpanel +++ b/src/freedombone-controlpanel @@ -49,27 +49,27 @@ function please_wait { #please_wait -max_files=0 +utils_files=0 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-* for f in $UTILS_FILES do - max_files=$((max_files + 1)) + utils_files=$((utils_files + 1)) done +apps_files=0 APP_FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-* for f in $APP_FILES do - max_files=$((max_files + 1)) + apps_files=$((apps_files + 1)) done UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-* file_ctr=0 -echo "0" | dialog --gauge $"Please wait" 7 70 0 -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 +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 APP_FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-* -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 -echo "100" | dialog --gauge $"Please wait" 7 70 0 +file_ctr=0 +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 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt SELECTED_USERNAME=