CLI Tools: Update messages, and make them more consistent

1 files changed, 10 insertions, 9 deletions

diff --git a/executor/executor.cc b/executor/executor.cc
index 7d9c3bf..c0fe0e6 100644
--- a/executor/executor.cc
+++ b/executor/executor.cc
@@ -2,7 +2,7 @@
  * executor.cc - Implementation of the HorizonScript executor
  * Project Horizon
  *
- * Copyright (c) 2019 Adélie Linux and contributors.  All rights reserved.
+ * Copyright (c) 2019-2020 Adélie Linux and contributors.  All rights reserved.
  * This code is licensed under the AGPL 3.0 license, as noted in the
  * LICENSE-code file in the root directory of this repository.
  *
@@ -34,25 +34,26 @@ int main(void) {
 #ifdef NON_LIBRE_FIRMWARE
     colour_if_pretty(std::cout, "31");
     std::cout << " (supports non-free firmware)";
-#endif
     reset_if_pretty(std::cout);
+#endif
     std::cout << std::endl;
-    std::cout << "Copyright (c) 2019 Adélie Linux and contributors.  "
-                 "AGPL-3.0 license." << std::endl;
-    std::cout << std::endl;
+    std::cout << "Copyright (c) 2019-2020 Adélie Linux and contributors."
+              << std::endl;
+    std::cout << "This software is licensed to you under the terms of the "
+              << std::endl << "AGPL 3.0 license, unless otherwise noted.";
+    std::cout << std::endl << std::endl;
 
     my_script = Horizon::Script::load("/etc/horizon/installfile", opts);
     if(my_script == nullptr) {
-        std::cout << "Could not load the specified script." << std::endl;
+        std::cout << "Could not load the HorizonScript." << std::endl;
         return EXIT_FAILURE;
     }
 
     if(!my_script->execute()) {
-        output_error("installfile", "Script failed.  Stop.", "");
+        output_error("internal", "Script failed.  Stop.", "");
         result_code = EXIT_FAILURE;
     } else {
-        output_info("installfile",
-                    "Adélie Linux has been successfully installed.", "");
+        output_info("internal", "Installation completed successfully.", "");
     }
 
     delete my_script;