From 096b50187a7d86c947a8a87f6b972ad5209bfb28 Mon Sep 17 00:00:00 2001
From: FingerlessGloves <me@FingerlessGloves.me>
Date: Tue, 18 Mar 2025 02:01:37 +0000
Subject: [PATCH 1/4] Fix GetTime for GMT users (#13)
UPS failes to use the required `+` when in the GMT timezone. Account for that.
---------
Co-authored-by: Greg T. Wallace <greg@gregtwallace.com>
---
pkg/apcssh/cmd_gettime.go | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pkg/apcssh/cmd_gettime.go b/pkg/apcssh/cmd_gettime.go
index 7da6397..139b0ba 100644
--- a/pkg/apcssh/cmd_gettime.go
+++ b/pkg/apcssh/cmd_gettime.go
@@ -28,6 +28,12 @@ func (cli *Client) GetTime() (time.Time, error) {
formatUPSVal := datePieces[3]
timeZoneVal := datePieces[4]
+ // GMT time requires + prefix
+ // APC UPS fails to use the required +, so add it
+ if timeZoneVal == "00:00" {
+ timeZoneVal = "+" + timeZoneVal
+ }
+
// known APC UPS format strings
dateFormatVal := ""
switch formatUPSVal {
From ad8c4e88a927b56bf0b055ed8da546983f1111c5 Mon Sep 17 00:00:00 2001
From: "Greg T. Wallace" <greg@gregtwallace.com>
Date: Mon, 17 Mar 2025 22:05:29 -0400
Subject: [PATCH 2/4] dep: go 1.24.1
---
.github/workflows/build_releases.yml | 2 +-
go.mod | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build_releases.yml b/.github/workflows/build_releases.yml
index 54c4b74..7ef37de 100644
--- a/.github/workflows/build_releases.yml
+++ b/.github/workflows/build_releases.yml
@@ -8,7 +8,7 @@ on:
env:
GITHUB_REF: ${{ github.ref }}
- GO_VERSION: '1.23.5'
+ GO_VERSION: '1.24.1'
jobs:
build-common:
diff --git a/go.mod b/go.mod
index f500bf1..9e40b33 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module apc-p15-tool
-go 1.23.5
+go 1.24.1
require (
github.com/peterbourgon/ff/v4 v4.0.0-alpha.4
From c67001f0e4210ada91bc74e1d4539ff5cdb046e5 Mon Sep 17 00:00:00 2001
From: "Greg T. Wallace" <greg@gregtwallace.com>
Date: Mon, 17 Mar 2025 22:06:46 -0400
Subject: [PATCH 3/4] dep: update all
---
go.mod | 4 ++--
go.sum | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/go.mod b/go.mod
index 9e40b33..3c00d28 100644
--- a/go.mod
+++ b/go.mod
@@ -5,10 +5,10 @@ go 1.24.1
require (
github.com/peterbourgon/ff/v4 v4.0.0-alpha.4
github.com/sigurn/crc16 v0.0.0-20240131213347-83fcde1e29d1
- golang.org/x/crypto v0.32.0
+ golang.org/x/crypto v0.36.0
)
-require golang.org/x/sys v0.29.0 // indirect
+require golang.org/x/sys v0.31.0 // indirect
replace apc-p15-tool/cmd/install_only => /cmd/install_only
diff --git a/go.sum b/go.sum
index 3b8cd0d..950e8c5 100644
--- a/go.sum
+++ b/go.sum
@@ -4,11 +4,11 @@ github.com/peterbourgon/ff/v4 v4.0.0-alpha.4 h1:aiqS8aBlF9PsAKeMddMSfbwp3smONCn3
github.com/peterbourgon/ff/v4 v4.0.0-alpha.4/go.mod h1:H/13DK46DKXy7EaIxPhk2Y0EC8aubKm35nBjBe8AAGc=
github.com/sigurn/crc16 v0.0.0-20240131213347-83fcde1e29d1 h1:NVK+OqnavpyFmUiKfUMHrpvbCi2VFoWTrcpI7aDaJ2I=
github.com/sigurn/crc16 v0.0.0-20240131213347-83fcde1e29d1/go.mod h1:9/etS5gpQq9BJsJMWg1wpLbfuSnkm8dPF6FdW2JXVhA=
-golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
-golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
+golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
+golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
+golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
From e87a3100d2762a6857fe0a12b017c834ddf5c561 Mon Sep 17 00:00:00 2001
From: "Greg T. Wallace" <greg@gregtwallace.com>
Date: Mon, 17 Mar 2025 22:06:52 -0400
Subject: [PATCH 4/4] v1.2.1
---
CHANGELOG.md | 7 +++++++
pkg/app/app.go | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9260307..f99a0f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
# APC P15 Tool Changelog
+## [v1.2.1] - 2025-03-17
+
+Fix time check for UPS when it is set to GMT timezone.
+
+All dependencies updated.
+
+
## [v1.2.0] - 2025-01-27
Add a new feature to `install` that checks the time of the UPS to confirm
diff --git a/pkg/app/app.go b/pkg/app/app.go
index 2392056..65b21be 100644
--- a/pkg/app/app.go
+++ b/pkg/app/app.go
@@ -12,7 +12,7 @@ import (
)
const (
- appVersion = "1.2.0"
+ appVersion = "1.2.1"
)
// struct for receivers to use common app pieces