X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fsite%2Fcommon.sh;h=deafdae2723ca9f73a3711f6cc38f9dde865dc98;hb=f26e5f2ec686975fd8274f47fd9917264a2d92de;hp=b20bae5de1004653e8a675f35e53b807cef529e9;hpb=0e93643e74f26bfc062a81c2f05ad947550f8d50;p=icn.git

diff --git a/deploy/site/common.sh b/deploy/site/common.sh
index b20bae5..deafdae 100644
--- a/deploy/site/common.sh
+++ b/deploy/site/common.sh
@@ -56,14 +56,27 @@ function sops_decrypt_site {
     sops --decrypt --in-place --config=${site_dir}/.sops.yaml ${site_yaml}
 }
 
+function flux_site_source_name {
+    local -r url=$1
+    local -r branch=$2
+    echo $(basename ${url})-${branch}
+}
+
+function flux_site_kustomization_name {
+    local -r url=$1
+    local -r branch=$2
+    local -r path=$3
+    echo $(flux_site_source_name ${url} ${branch})-site-$(basename ${path})
+}
+
 function flux_create_site {
     local -r url=$1
     local -r branch=$2
     local -r path=$3
     local -r key_name=$4
 
-    local -r source_name="$(basename ${url})-${branch}"
-    local -r kustomization_name="${source_name}-site-$(basename ${path})"
+    local -r source_name=$(flux_site_source_name ${url} ${branch})
+    local -r kustomization_name=$(flux_site_kustomization_name ${url} ${branch} ${path})
     local -r key_fp=$(gpg --with-colons --list-secret-keys ${key_name} | awk -F: '/fpr/ {print $10;exit}')
     local -r secret_name="${key_name}-sops-gpg"