From 1cd72d82372a9e89bdf406f58ae8609e344a1bd1 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sat, 26 Oct 2019 02:25:41 -0500
Subject: hscript: Fix missing endl for timezone simulation; print what's
 happening

---
 hscript/meta.cc | 9 ++++++++-
 hscript/user.cc | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'hscript')

diff --git a/hscript/meta.cc b/hscript/meta.cc
index 9f0da76..66e96f2 100644
--- a/hscript/meta.cc
+++ b/hscript/meta.cc
@@ -264,6 +264,10 @@ Key *Language::parseFromData(const std::string &data, int lineno, int *errors,
 
 
 bool Language::execute(ScriptOptions opts) const {
+    output_info("installfile:" + std::to_string(this->lineno()),
+                "language: setting default system language to " +
+                this->value());
+
     if(opts.test(Simulate)) {
         std::cout << "printf '#!/bin/sh\\" << "nexport LANG=\"%s\"\\" << "n'"
                   << this->value() << " > /target/etc/profile.d/language.sh"
@@ -360,13 +364,16 @@ Key *Timezone::parseFromData(const std::string &data, int lineno, int *errors,
 }
 
 bool Timezone::execute(ScriptOptions opts) const {
+    output_info("installfile:" + std::to_string(this->lineno()),
+                "timezone: setting system timezone to " + this->value());
+
     if(opts.test(Simulate)) {
         /* If the target doesn't have tzdata installed, copy the zoneinfo from
          * the Horizon environment. */
         std::cout << "([ -f /target/usr/share/zoneinfo/" << this->value()
                   << " ] && ln -s /usr/share/zoneinfo/" << this->value()
                   << " /target/etc/localtime) || cp /usr/share/zoneinfo/"
-                  << this->value() << " /target/etc/localtime";
+                  << this->value() << " /target/etc/localtime" << std::endl;
         return true;
     }
 
diff --git a/hscript/user.cc b/hscript/user.cc
index b288070..f654db9 100644
--- a/hscript/user.cc
+++ b/hscript/user.cc
@@ -137,6 +137,9 @@ bool RootPassphrase::execute(ScriptOptions options) const {
     const std::string root_line = "root:" + this->_value + ":" +
             std::to_string(time(nullptr) / 86400) + ":0:::::";
 
+    output_info("installfile:" + std::to_string(this->lineno()),
+                "rootpw: setting root passphrase");
+
     if(options.test(Simulate)) {
         std::cout << "(printf '" << root_line << "\\" << "n'; "
                   << "cat /target/etc/shadow | sed '1d') > /tmp/shadow"
-- 
cgit v1.2.3-70-g09d2