Upgrade to abiword-3.0.0

[hvlinux.git] / stage1 / hv-install-1

diff --git a/stage1/hv-install-1 b/stage1/hv-install-1
index 1bc05c2..13f564d 100755 (executable)
--- a/stage1/hv-install-1
+++ b/stage1/hv-install-1
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-hvtrap_setup
-source ../packages-list
+source ../functions/main
 
+check_for_root_user
 init_log_file
 
+# This function will exit if the stage is already completed
+check_completed_stage
+
 rscr mult "Performing pre-install" pre-install
 
 # Logging-in as 'lfs' user, and executing the hv-install-2 script. The
@@ -16,7 +16,7 @@ rscr mult "Performing pre-install" pre-install
 su - lfs -c "cd ${PWD}; ./hv-install-2"
 
 rscr mult "Performing post-install" post-install
-
-echo "Total build time: $(get_total_build_time ${LFS_LOG_FILE})h"
+write_completed_stage
+display_stage_build_stats
 
 exit 0