From d586a5ab1975e7f06a43f816e3809753d9606cba Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 10 May 2023 13:28:51 +0200
Subject: daily-psk: simplify calculation

Use a named array, and drop the loop...
---
 daily-psk.capsman.rsc  | 12 +++---------
 daily-psk.local.rsc    | 12 +++---------
 daily-psk.template.rsc | 12 +++---------
 3 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/daily-psk.capsman.rsc b/daily-psk.capsman.rsc
index e589991..65a17d0 100644
--- a/daily-psk.capsman.rsc
+++ b/daily-psk.capsman.rsc
@@ -33,19 +33,13 @@ $WaitFullyConnected;
 
   :global DailyPskSecrets;
 
-  :local Months { "jan"; "feb"; "mar"; "apr"; "may"; "jun";
-                  "jul"; "aug"; "sep"; "oct"; "nov"; "dec" };
+  :local Months { "jan"=1; "feb"=2; "mar"=3; "apr"=4; "may"=5; "jun"=6;
+                  "jul"=7; "aug"=8; "sep"=9; "oct"=10; "nov"=11; "dec"=12 };
 
-  :local Month [ :pick $Date 0 3 ];
+  :local Month ($Months->[ :pick $Date 0 3 ]);
   :local Day [ :tonum [ :pick $Date 4 6 ] ];
   :local Year [ :pick $Date 7 11 ];
 
-  :for MIndex from=0 to=[ :len $Months ] do={
-    :if ($Months->$MIndex = $Month) do={
-      :set Month ($MIndex + 1);
-    }
-  }
-
   :local A ((14 - $Month) / 12);
   :local B ($Year - $A);
   :local C ($Month + 12 * $A - 2);
diff --git a/daily-psk.local.rsc b/daily-psk.local.rsc
index df17173..94991a7 100644
--- a/daily-psk.local.rsc
+++ b/daily-psk.local.rsc
@@ -33,19 +33,13 @@ $WaitFullyConnected;
 
   :global DailyPskSecrets;
 
-  :local Months { "jan"; "feb"; "mar"; "apr"; "may"; "jun";
-                  "jul"; "aug"; "sep"; "oct"; "nov"; "dec" };
+  :local Months { "jan"=1; "feb"=2; "mar"=3; "apr"=4; "may"=5; "jun"=6;
+                  "jul"=7; "aug"=8; "sep"=9; "oct"=10; "nov"=11; "dec"=12 };
 
-  :local Month [ :pick $Date 0 3 ];
+  :local Month ($Months->[ :pick $Date 0 3 ]);
   :local Day [ :tonum [ :pick $Date 4 6 ] ];
   :local Year [ :pick $Date 7 11 ];
 
-  :for MIndex from=0 to=[ :len $Months ] do={
-    :if ($Months->$MIndex = $Month) do={
-      :set Month ($MIndex + 1);
-    }
-  }
-
   :local A ((14 - $Month) / 12);
   :local B ($Year - $A);
   :local C ($Month + 12 * $A - 2);
diff --git a/daily-psk.template.rsc b/daily-psk.template.rsc
index 5f30ce3..e2a3d59 100644
--- a/daily-psk.template.rsc
+++ b/daily-psk.template.rsc
@@ -34,19 +34,13 @@ $WaitFullyConnected;
 
   :global DailyPskSecrets;
 
-  :local Months { "jan"; "feb"; "mar"; "apr"; "may"; "jun";
-                  "jul"; "aug"; "sep"; "oct"; "nov"; "dec" };
+  :local Months { "jan"=1; "feb"=2; "mar"=3; "apr"=4; "may"=5; "jun"=6;
+                  "jul"=7; "aug"=8; "sep"=9; "oct"=10; "nov"=11; "dec"=12 };
 
-  :local Month [ :pick $Date 0 3 ];
+  :local Month ($Months->[ :pick $Date 0 3 ]);
   :local Day [ :tonum [ :pick $Date 4 6 ] ];
   :local Year [ :pick $Date 7 11 ];
 
-  :for MIndex from=0 to=[ :len $Months ] do={
-    :if ($Months->$MIndex = $Month) do={
-      :set Month ($MIndex + 1);
-    }
-  }
-
   :local A ((14 - $Month) / 12);
   :local B ($Year - $A);
   :local C ($Month + 12 * $A - 2);
-- 
cgit v1.2.3-70-g09d2