From eccaa8be514e6f17589e8b875b3a32e1e1f96fde Mon Sep 17 00:00:00 2001
From: Ewan Baxter <ewan@toughbaxter.com>
Date: Mon, 9 Dec 2024 12:28:36 -0400
Subject: [PATCH 01/11] config changes
---
config.txt.example | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/config.txt.example b/config.txt.example
index 8603317..b3b8c1f 100644
--- a/config.txt.example
+++ b/config.txt.example
@@ -1,10 +1,10 @@
-USERNAME=bbasin
+USERNAME=data-write
PASSWORD=YOUR_SERVER_PASSWORD
-REMOTE_SERVER=data.ceotr.ca
+REMOTE_SERVER=big-data.ceotr.ca
LOCAL_ROOT_PATH=<YOU LOCAL PC PATH TO DATA >
LOCAL_LOG_PATH=<YOUR_LOG_PATH>
-REMOTE_ROOT_PATH=/data/bbasin/weekly_timeseries/
-YEAR=2023
+REMOTE_ROOT_PATH=/home/data-write/data/bbasin/weekly_timeseries
+YEAR=2024
DEBUG=false
BOP_PATH="Data BOP %YEAR% Raw"
HYP_PATH="Data Hyperpro HYP %YEAR% Raw"
--
GitLab
From 5ae8edfbf43f129f9c9a310c052da68207017528 Mon Sep 17 00:00:00 2001
From: Ewan Baxter <ewan@toughbaxter.com>
Date: Mon, 9 Dec 2024 12:30:14 -0400
Subject: [PATCH 02/11] mend
---
config.txt.example | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config.txt.example b/config.txt.example
index b3b8c1f..b487d62 100644
--- a/config.txt.example
+++ b/config.txt.example
@@ -9,4 +9,4 @@ DEBUG=false
BOP_PATH="Data BOP %YEAR% Raw"
HYP_PATH="Data Hyperpro HYP %YEAR% Raw"
HYM_PATH="Data Hyperpro HYM %YEAR% Raw"
-SSH_KEY="C:\Users\ceotr\rtowse.ppk"
\ No newline at end of file
+SSH_KEY=<PATH TO YOUR SSH KEY FILE>
\ No newline at end of file
--
GitLab
From 06af36761deae7dcfc209d8799fa330cdc2a67ec Mon Sep 17 00:00:00 2001
From: Ewan Baxter <ewan@toughbaxter.com>
Date: Mon, 9 Dec 2024 12:51:14 -0400
Subject: [PATCH 03/11] mend
---
config.txt.example | 1 +
1 file changed, 1 insertion(+)
diff --git a/config.txt.example b/config.txt.example
index b487d62..58b23bc 100644
--- a/config.txt.example
+++ b/config.txt.example
@@ -1,4 +1,5 @@
USERNAME=data-write
+GROUPNAME=data-read
PASSWORD=YOUR_SERVER_PASSWORD
REMOTE_SERVER=big-data.ceotr.ca
LOCAL_ROOT_PATH=<YOU LOCAL PC PATH TO DATA >
--
GitLab
From 48e2b36c0fc1b62c8b8000ee0bb177c14e7259c1 Mon Sep 17 00:00:00 2001
From: Ewan Baxter <ewan@toughbaxter.com>
Date: Mon, 9 Dec 2024 13:12:29 -0400
Subject: [PATCH 04/11] mend
---
bbasin_data_upload.bat | 9 +++++++++
config.txt.example | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/bbasin_data_upload.bat b/bbasin_data_upload.bat
index e64cdaa..efc8659 100644
--- a/bbasin_data_upload.bat
+++ b/bbasin_data_upload.bat
@@ -48,6 +48,7 @@ if not defined WINSCP_PATH (
:: Validate configuration variables
call :validate_var %USERNAME% USERNAME
+call :validate_var %GROUP_NAME GROUP_NAME
rem call :validate_var %PASSWORD% PASSWORD
call :validate_var %SSH_KEY% SSH_KEY
@@ -91,6 +92,14 @@ echo Uploading file...
echo "WinSCP.com /command !CMD!"
WinSCP.com /command !CMD!
echo "WinSCP.com /command !CMD!"
+
+:: Loop through each remote path and change the group ownership
+for /l %%i in (0, 1, 2) do (
+ echo Changing group ownership for path: !REMOTE_PATHS[%%i]!
+ set CMD2=!ORG_CMD! "cd !REMOTE_PATHS[%%i]!" "chgrp -R %GROUP_NAME% *" "exit"
+ WinSCP.com /command !CMD2!
+)
+
endlocal
pause
diff --git a/config.txt.example b/config.txt.example
index 58b23bc..9d054f7 100644
--- a/config.txt.example
+++ b/config.txt.example
@@ -1,5 +1,5 @@
USERNAME=data-write
-GROUPNAME=data-read
+GROUP_NAME=data-read
PASSWORD=YOUR_SERVER_PASSWORD
REMOTE_SERVER=big-data.ceotr.ca
LOCAL_ROOT_PATH=<YOU LOCAL PC PATH TO DATA >
--
GitLab
From 5891f6d2983dab473c6860952621a49042499dad Mon Sep 17 00:00:00 2001
From: Ewan Baxter <ewan@toughbaxter.com>
Date: Mon, 9 Dec 2024 13:31:01 -0400
Subject: [PATCH 05/11] Add code to set group ownership of synchronized files
---
bbasin_data_upload.bat | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/bbasin_data_upload.bat b/bbasin_data_upload.bat
index efc8659..ddaa3f1 100644
--- a/bbasin_data_upload.bat
+++ b/bbasin_data_upload.bat
@@ -94,11 +94,13 @@ WinSCP.com /command !CMD!
echo "WinSCP.com /command !CMD!"
:: Loop through each remote path and change the group ownership
+set CMD2=!ORG_CMD!
for /l %%i in (0, 1, 2) do (
echo Changing group ownership for path: !REMOTE_PATHS[%%i]!
- set CMD2=!ORG_CMD! "cd !REMOTE_PATHS[%%i]!" "chgrp -R %GROUP_NAME% *" "exit"
- WinSCP.com /command !CMD2!
+ set CMD2=!CMD2! "cd !REMOTE_PATHS[%%i]!" "chgrp -R %GROUP_NAME% *"
)
+set CMD2=!CMD2! "exit"
+WinSCP.com /command !CMD2!
endlocal
pause
--
GitLab
From abb733718fcf873461e99ac69b0dc46d2aa152c4 Mon Sep 17 00:00:00 2001
From: Ewan Baxter <ewan@toughbaxter.com>
Date: Mon, 9 Dec 2024 13:46:48 -0400
Subject: [PATCH 06/11] update year
---
config.txt.example | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config.txt.example b/config.txt.example
index 9d054f7..a5504de 100644
--- a/config.txt.example
+++ b/config.txt.example
@@ -5,7 +5,7 @@ REMOTE_SERVER=big-data.ceotr.ca
LOCAL_ROOT_PATH=<YOU LOCAL PC PATH TO DATA >
LOCAL_LOG_PATH=<YOUR_LOG_PATH>
REMOTE_ROOT_PATH=/home/data-write/data/bbasin/weekly_timeseries
-YEAR=2024
+YEAR=2025
DEBUG=false
BOP_PATH="Data BOP %YEAR% Raw"
HYP_PATH="Data Hyperpro HYP %YEAR% Raw"
--
GitLab
From 0dec6d8edbca318d0ecca3be9e914cdaa2a81879 Mon Sep 17 00:00:00 2001
From: Ewan Baxter <ewan@toughbaxter.com>
Date: Tue, 10 Dec 2024 11:44:59 -0400
Subject: [PATCH 07/11] fix assigning variable
---
bbasin_data_upload.bat | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bbasin_data_upload.bat b/bbasin_data_upload.bat
index ddaa3f1..5892fb8 100644
--- a/bbasin_data_upload.bat
+++ b/bbasin_data_upload.bat
@@ -59,10 +59,10 @@ echo "###############################################"
rem call :fix_password
call :validate_var %REMOTE_SERVER% REMOTE_SERVER
call :validate_var %LOCAL_ROOT_PATH% LOCAL_ROOT_PATH
-set LOCAL_ROOT_PATH-"%LOCAL_ROOT_PATH%"
+set LOCAL_ROOT_PATH="%LOCAL_ROOT_PATH%"
call :validate_var %REMOTE_ROOT_PATH%
call :validate_var %LOCAL_LOG_PATH% LOCAL_LOG_PATH
-set LOCAL_ROOT_PATH-"%LOCAL_LOG_PATH%"
+set LOCAL_ROOT_PATH="%LOCAL_LOG_PATH%"
:: Display the loaded variables for %REMOTE_ROOT_PATH%debugging purposes
call :debug_fun
--
GitLab
From c6d0bef0594e3a04920d9036d55706ec550bb963 Mon Sep 17 00:00:00 2001
From: Ewan Baxter <ewan@toughbaxter.com>
Date: Tue, 10 Dec 2024 12:01:33 -0400
Subject: [PATCH 08/11] fix bad variable assignment
---
bbasin_data_upload.bat | 1 -
1 file changed, 1 deletion(-)
diff --git a/bbasin_data_upload.bat b/bbasin_data_upload.bat
index 5892fb8..5751a9f 100644
--- a/bbasin_data_upload.bat
+++ b/bbasin_data_upload.bat
@@ -62,7 +62,6 @@ call :validate_var %LOCAL_ROOT_PATH% LOCAL_ROOT_PATH
set LOCAL_ROOT_PATH="%LOCAL_ROOT_PATH%"
call :validate_var %REMOTE_ROOT_PATH%
call :validate_var %LOCAL_LOG_PATH% LOCAL_LOG_PATH
-set LOCAL_ROOT_PATH="%LOCAL_LOG_PATH%"
:: Display the loaded variables for %REMOTE_ROOT_PATH%debugging purposes
call :debug_fun
--
GitLab
From f6c156f3ec725db01718dfdc3ecce0a583a4fde6 Mon Sep 17 00:00:00 2001
From: Ewan Baxter <ewan@toughbaxter.com>
Date: Tue, 10 Dec 2024 12:10:20 -0400
Subject: [PATCH 09/11] fix typo
---
bbasin_data_upload.bat | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bbasin_data_upload.bat b/bbasin_data_upload.bat
index 5751a9f..84f0b51 100644
--- a/bbasin_data_upload.bat
+++ b/bbasin_data_upload.bat
@@ -95,8 +95,8 @@ echo "WinSCP.com /command !CMD!"
:: Loop through each remote path and change the group ownership
set CMD2=!ORG_CMD!
for /l %%i in (0, 1, 2) do (
- echo Changing group ownership for path: !REMOTE_PATHS[%%i]!
- set CMD2=!CMD2! "cd !REMOTE_PATHS[%%i]!" "chgrp -R %GROUP_NAME% *"
+ echo Changing group ownership for path: !REMOTE_PATH[%%i]!
+ set CMD2=!CMD2! "cd !REMOTE_PATH[%%i]!" "chgrp -R %GROUP_NAME% *"
)
set CMD2=!CMD2! "exit"
WinSCP.com /command !CMD2!
--
GitLab
From 39ea5ade6074efed458f99a45a134f0b7d8e05e0 Mon Sep 17 00:00:00 2001
From: Ewan Baxter <ewan@toughbaxter.com>
Date: Tue, 10 Dec 2024 12:12:31 -0400
Subject: [PATCH 10/11] revert a previous change to variable assignment
---
bbasin_data_upload.bat | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/bbasin_data_upload.bat b/bbasin_data_upload.bat
index 84f0b51..9acd2c0 100644
--- a/bbasin_data_upload.bat
+++ b/bbasin_data_upload.bat
@@ -59,9 +59,10 @@ echo "###############################################"
rem call :fix_password
call :validate_var %REMOTE_SERVER% REMOTE_SERVER
call :validate_var %LOCAL_ROOT_PATH% LOCAL_ROOT_PATH
-set LOCAL_ROOT_PATH="%LOCAL_ROOT_PATH%"
+set LOCAL_ROOT_PATH-"%LOCAL_ROOT_PATH%"
call :validate_var %REMOTE_ROOT_PATH%
call :validate_var %LOCAL_LOG_PATH% LOCAL_LOG_PATH
+set LOCAL_ROOT_PATH-"%LOCAL_LOG_PATH%"
:: Display the loaded variables for %REMOTE_ROOT_PATH%debugging purposes
call :debug_fun
--
GitLab
From d692325f5f825a978d6a8bfe759e8e94d9595461 Mon Sep 17 00:00:00 2001
From: Ewan Baxter <ewan@toughbaxter.com>
Date: Tue, 10 Dec 2024 12:27:50 -0400
Subject: [PATCH 11/11] fix group change command
---
bbasin_data_upload.bat | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bbasin_data_upload.bat b/bbasin_data_upload.bat
index 9acd2c0..1f294a1 100644
--- a/bbasin_data_upload.bat
+++ b/bbasin_data_upload.bat
@@ -97,7 +97,7 @@ echo "WinSCP.com /command !CMD!"
set CMD2=!ORG_CMD!
for /l %%i in (0, 1, 2) do (
echo Changing group ownership for path: !REMOTE_PATH[%%i]!
- set CMD2=!CMD2! "cd !REMOTE_PATH[%%i]!" "chgrp -R %GROUP_NAME% *"
+ set CMD2=!CMD2! "call chgrp -R %GROUP_NAME% !REMOTE_PATH[%%i]!"
)
set CMD2=!CMD2! "exit"
WinSCP.com /command !CMD2!
--
GitLab