Accommodate possible bug in pkg where progress total is reported as zero

1 files changed, 10 insertions, 2 deletions

diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php
index e3cc39f..7b8e872 100644
--- a/src/usr/local/www/pkg_mgr_install.php
+++ b/src/usr/local/www/pkg_mgr_install.php
@@ -513,8 +513,16 @@ function getLogsStatus() {
 
 			if("<?=$progbar?>") {
 				if (json.data) {
-					setProgress('progressbar', ((json.data.current * 100) / json.data.total), true);
+					// There appears to be a bug in pkg that can cause "total" to be reported as zero
+					if (json.data.total > 0) {
+						setProgress('progressbar', ((json.data.current * 100) / json.data.total), true);
+					}
+
 					progress = json.data.total - json.data.current
+					if (progress < 0) {
+						progress = 0;
+					}
+
 				}
 			}
 			// Now we need to determine if the installation/removal was successful, and tell the user. Not as easy as it sounds :)
@@ -551,8 +559,8 @@ events.push(function(){
 	// we only meed to re-populate the progress indicator and the status banner
 	if ( "<?=$_POST['completed']?>" == "true") {
 		setProgress('progressbar', 100, false);
-		scrollToBottom();
 		show_success();
+		setTimeout(scrollToBottom, 200);
 	}
 });
 //]]>