From 555a2f052f516a2d1f4a06b610906fd9b181ff3a Mon Sep 17 00:00:00 2001
From: York-Simon Johannsen <info@yosijo.de>
Date: Thu, 8 Jun 2023 17:31:20 +0200
Subject: [PATCH] Optimize recreateRepoConfigFile.sh

---
 helpers/shells/recreateRepoConfigFile.sh | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/helpers/shells/recreateRepoConfigFile.sh b/helpers/shells/recreateRepoConfigFile.sh
index 65116ac..7d109e4 100644
--- a/helpers/shells/recreateRepoConfigFile.sh
+++ b/helpers/shells/recreateRepoConfigFile.sh
@@ -34,7 +34,9 @@ for directory in $directoriesList ; do
     comment=""
     displayDetails=true
     status=false
-    sshPublicKey=$(grep -oP '(?<=restrict ).*' "$bwDataDir/$directory/.ssh/authorized_keys" )
+    sshPublicKey=$(grep --only-matching --perl-regexp \
+      '(?<=restrict ).*' \
+      "$bwDataDir/$directory/.ssh/authorized_keys")
 
     # Create a valid JSON object with jq for each repo
     objRepoJSON=$(jq -n --argjson id $id \
@@ -49,10 +51,25 @@ for directory in $directoriesList ; do
                         --arg comment "$comment" \
                         --argjson displayDetails $displayDetails \
                         --arg unixUser "$unixUser" \
-                        '{id: $id, alias: $alias, repository: $repository, status: $status, lastSave: $lastSave, alert: $alert, storageSize: $storageSize, storageUsed: $storageUsed, sshPublicKey: $sshPublicKey, comment: $comment, displayDetails: $displayDetails, unixUser: $unixUser}')
+                        "{ \
+                          id:             \$id,             \
+                          alias:          \$alias,          \
+                          repository:     \$repository,     \
+                          status:         \$status,         \
+                          lastSave:       \$lastSave,       \
+                          alert:          \$alert,          \
+                          storageSize:    \$storageSize,    \
+                          storageUsed:    \$storageUsed,    \
+                          sshPublicKey:   \$sshPublicKey,   \
+                          comment:        \$comment,        \
+                          displayDetails: \$displayDetails, \
+                          unixUser:       \$unixUser        \
+                        }")
 
     # Insert objRepoJSON in finalObject with jq
-    finalObject=$(jq --argjson objRepoJSON "$objRepoJSON" '. += [$objRepoJSON]' <<< "$finalObject")
+    finalObject=$(jq --argjson objRepoJSON  \
+      "$objRepoJSON" '. += [$objRepoJSON]' \
+      <<< "$finalObject")
 
     i=$((i+1))
 done