From 11097f7390e434201a4e84e2f906a70b8dfce46a Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Tue, 14 Aug 2018 13:29:29 +0100
Subject: [PATCH] Completion of tables
---
src/freedombone-utils-webadmin | 52 ++++++++++++++++++++--------------
1 file changed, 30 insertions(+), 22 deletions(-)
diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index e674c0031..8aa6571de 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -329,18 +329,22 @@ function web_admin_create_add_apps {
fi
done
- # Complete the rest of the four column row
- # shellcheck disable=SC2034
- for i in $(seq ${available_apps_ctr} 3)
- do
- { echo ' <div class="column">';
- echo ' <div>';
- echo ' </div>';
- echo ' </div>'; } >> "$appslist_add_filename"
- done
+ if [ ${available_apps_ctr} -gt 0 ]; then
+ # Complete the rest of the four column row
+ # shellcheck disable=SC2034
+ for i in $(seq ${available_apps_ctr} 3)
+ do
+ { echo ' <div class="column">';
+ echo ' <div>';
+ echo ' </div>';
+ echo ' </div>'; } >> "$appslist_add_filename"
+ done
+ echo ' </div>' >> "$appslist_add_filename"
+ fi
- echo ' </body>' >> "$appslist_add_filename"
- echo '</html>' >> "$appslist_add_filename"
+ { echo ' <br><br>';
+ echo ' </body>';
+ echo '</html>'; } >> "$appslist_add_filename"
chown -R www-data:www-data "$webadmin_install_dir"
}
@@ -475,18 +479,22 @@ function web_admin_create_installed_apps {
app_index=$((app_index+1))
done
- # Complete the rest of the four column row
- # shellcheck disable=SC2034
- for i in $(seq ${installed_apps_ctr} 3)
- do
- { echo ' <div class="column">';
- echo ' <div>';
- echo ' </div>';
- echo ' </div>'; } >> "$appslist_filename"
- done
+ if [ ${installed_apps_ctr} -gt 0 ]; then
+ # Complete the rest of the four column row
+ # shellcheck disable=SC2034
+ for i in $(seq ${installed_apps_ctr} 3)
+ do
+ { echo ' <div class="column">';
+ echo ' <div>';
+ echo ' </div>';
+ echo ' </div>'; } >> "$appslist_filename"
+ done
+ echo ' </div>' >> "$appslist_filename"
+ fi
- echo ' </body>' >> "$appslist_filename"
- echo '</html>' >> "$appslist_filename"
+ { echo ' <br><br>';
+ echo ' </body>';
+ echo '</html>'; } >> "$appslist_filename"
chown -R www-data:www-data "$webadmin_install_dir"
}
--
GitLab