From 231d684c1c4d68e74acb02fc88c4f2ce145fc5a8 Mon Sep 17 00:00:00 2001
From: Niko Ehrenfeuchter <nikolaus.ehrenfeuchter@unibas.ch>
Date: Tue, 13 Mar 2018 16:30:06 +0100
Subject: [PATCH] Move status file to "var/" subdirectory
Refers to #5
---
ATxService/AutoTx.cs | 2 +-
ATxTray/AutoTxTray.cs | 4 ++--
Scripts/Make-Package.ps1 | 1 +
Updater/Update-Service.ps1 | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ATxService/AutoTx.cs b/ATxService/AutoTx.cs
index 58cbcc9..2f95e7f 100644
--- a/ATxService/AutoTx.cs
+++ b/ATxService/AutoTx.cs
@@ -299,7 +299,7 @@ namespace ATxService
/// </summary>
private void LoadStatus() {
var statusPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory,
- "status.xml");
+ "var", "status.xml");
try {
Log.Debug("Trying to load status from [{0}]", statusPath);
_status = ServiceStatus.Deserialize(statusPath, _config);
diff --git a/ATxTray/AutoTxTray.cs b/ATxTray/AutoTxTray.cs
index eecbc91..cf24f6a 100644
--- a/ATxTray/AutoTxTray.cs
+++ b/ATxTray/AutoTxTray.cs
@@ -73,7 +73,7 @@ namespace ATxTray
SetupLogging();
- _statusFile = Path.Combine(baseDir, "status.xml");
+ _statusFile = Path.Combine(baseDir, "var", "status.xml");
Log.Info("-----------------------");
Log.Info("{0} initializing...", AppTitle);
@@ -114,7 +114,7 @@ namespace ATxTray
Log.Trace("Enabled timer.");
var fsw = new FileSystemWatcher {
- Path = baseDir,
+ Path = Path.Combine(baseDir, "var"),
NotifyFilter = NotifyFilters.LastWrite,
Filter = "status.xml",
};
diff --git a/Scripts/Make-Package.ps1 b/Scripts/Make-Package.ps1
index b16fdbe..cf5e361 100644
--- a/Scripts/Make-Package.ps1
+++ b/Scripts/Make-Package.ps1
@@ -66,6 +66,7 @@ if (Test-Path $PkgDir) {
$dir = New-Item -ItemType Container -Force -Path "$($PkgDir)\AutoTx"
$tgt = $dir.FullName
New-Item -ItemType Container -Force -Path "$($PkgDir)\AutoTx\conf" | Out-Null
+New-Item -ItemType Container -Force -Path "$($PkgDir)\AutoTx\var" | Out-Null
Copy-Item -Exclude *.pdb -Recurse "$($BinariesDirService)\*" $tgt
Copy-Item -Exclude *.pdb -Recurse "$($BinariesDirTrayApp)\*" $tgt -EA Ignore
diff --git a/Updater/Update-Service.ps1 b/Updater/Update-Service.ps1
index d5e4708..3118214 100644
--- a/Updater/Update-Service.ps1
+++ b/Updater/Update-Service.ps1
@@ -591,7 +591,7 @@ $ServiceRunningBefore = ServiceIsRunning $ServiceName
$ConfigPath = "$($InstallationPath)\conf"
$LogPath = "$($InstallationPath)"
$LogFile = "$($LogPath)\AutoTx.log"
-$StatusXml = "$($InstallationPath)\status.xml"
+$StatusXml = "$($InstallationPath)\var\status.xml"
$UpdPathConfig = "$($UpdateSourcePath)\Configs"
--
GitLab