From 38a34471c532a3034bac52692eb2261c05e3d730 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 29 May 2020 09:53:58 -0500
Subject: hscript: Timezone: Always remove existing localtime

Otherwise, if the target doesn't have tzdata installed, an existing
/etc/localtime file won't be removed and we can hit an error.
---
 hscript/meta.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'hscript')

diff --git a/hscript/meta.cc b/hscript/meta.cc
index dc17290..ff39d4a 100644
--- a/hscript/meta.cc
+++ b/hscript/meta.cc
@@ -491,9 +491,9 @@ bool Timezone::execute() const {
     std::string target_zi = script->targetDirectory() + zi_path;
     std::string target_lt = script->targetDirectory() + "/etc/localtime";
     error_code ec;
-    if(fs::exists(target_zi, ec)) {
-        if(fs::exists(target_lt, ec)) fs::remove(target_lt, ec);
+    if(fs::exists(target_lt, ec)) fs::remove(target_lt, ec);
 
+    if(fs::exists(target_zi, ec)) {
         fs::create_symlink(zi_path, target_lt, ec);
         if(ec) {
             output_error(pos, "timezone: failed to create symbolic link",
-- 
cgit v1.2.3-70-g09d2