From e756e712032562c7d070b44559400ad04096cbd4 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Sat, 13 May 2023 13:44:17 -0700
Subject: [PATCH] move syncing into common

---
 func/common/.imports.sh.swp    | Bin 0 -> 16384 bytes
 sync/common                    |  57 +++++++++++++++++++++++++++++++++
 sync/sync-to-staging.delete.sh |  23 ++++++-------
 sync/sync-to-staging.sh        |  27 ++++++++--------
 4 files changed, 83 insertions(+), 24 deletions(-)
 create mode 100644 func/common/.imports.sh.swp

diff --git a/func/common/.imports.sh.swp b/func/common/.imports.sh.swp
new file mode 100644
index 0000000000000000000000000000000000000000..d2de4b47a18d3e27d1a0fbda80ea7a674a68a24b
GIT binary patch
literal 16384
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
HB<B7DY#z6+

literal 0
HcmV?d00001

diff --git a/sync/common b/sync/common
index 0c50eac..e4b0dc5 100644
--- a/sync/common
+++ b/sync/common
@@ -1,3 +1,4 @@
+#!/bin/bash
 # To be sourced by scripts to use
 
 # Variables that can be overriden should be noted with optional context. It is
@@ -65,3 +66,59 @@ MODS=(
 # Used to iterate over ISOs?
 # Override: Allowed
 VARIANTS=(boot minimal dvd1)
+
+# Syncing functions
+function parallel_rsync_no_delete_staging() {
+  TARGET="${1}"
+  sudo -l && find **/* -maxdepth 0 -type d | parallel --will-cite -j 18 sudo rsync -av --chown=10004:10005 --progress --relative --human-readable {} "${TARGET}"
+}
+
+function parallel_rsync_no_delete_prod() {
+  TARGET="${1}"
+  sudo -l && find ./ -mindepth 1 -maxdepth 1 -type d -exec find {}/ -mindepth 1 -maxdepth 1 -type d \;|sed 's/^..//g' | parallel --will-cite -j 18 sudo rsync -av --chown=10004:10005 --progress --relative --human-readable {} "${TARGET}"
+  # shellcheck disable=SC2035
+  sudo -l && find ** -maxdepth 0 -type l | parallel --will-cite -j 18 sudo rsync -av --chown=10004:10005 --progress --relative --human-readable {} "${TARGET}"
+}
+
+function parallel_rsync_delete_staging() {
+  TARGET="${1}"
+  sudo -l && find **/* -maxdepth 0 -type d | parallel --will-cite -j 18 sudo rsync -av --chown=10004:10005 --progress --relative --human-readable --delete {} "${TARGET}"
+}
+
+function parallel_rsync_delete_prod() {
+  TARGET="${1}"
+  sudo -l && find ./ -mindepth 1 -maxdepth 1 -type d -exec find {}/ -mindepth 1 -maxdepth 1 -type d \;|sed 's/^..//g' | parallel --will-cite -j 18 sudo rsync -av --chown=10004:10005 --progress --relative --human-readable --delete {} "${TARGET}"
+  # shellcheck disable=SC2035
+  sudo -l && find ** -maxdepth 0 -type l | parallel --will-cite -j 18 sudo rsync -av --chown=10004:10005 --progress --relative --human-readable {} "${TARGET}"
+}
+
+function rsync_no_delete_staging() {
+  TARGET="${1}"
+  sudo -l && rsync -vrlptDSH --chown=10004:10005 --progress --human-readable compose/ "${TARGET}"
+}
+
+function rsync_no_delete_prod() {
+  REV="${1}"
+  TARGET="${2}"
+  sudo -l && rsync -vrlptDSH --chown=10004:10005 --progress --human-readable "${REV}/" "${TARGET}"
+}
+
+function rsync_delete_staging() {
+  TARGET="${1}"
+  sudo -l && rsync -vrlptDSH --chown=10004:10005 --progress --human-readable --delete compose/ "${TARGET}"
+}
+
+function rsync_delete_prod() {
+  REV="${1}"
+  TARGET="${2}"
+  sudo -l && rsync -vrlptDSH --chown=10004:10005 --progress --human-readable --delete "${REV}/" "${TARGET}"
+}
+
+export -f parallel_rsync_no_delete_staging
+export -f parallel_rsync_no_delete_prod
+export -f parallel_rsync_delete_staging
+export -f parallel_rsync_delete_prod
+export -f rsync_no_delete_staging
+export -f rsync_no_delete_prod
+export -f rsync_delete_staging
+export -f rsync_delete_prod
diff --git a/sync/sync-to-staging.delete.sh b/sync/sync-to-staging.delete.sh
index dd8be5b..902c91a 100644
--- a/sync/sync-to-staging.delete.sh
+++ b/sync/sync-to-staging.delete.sh
@@ -15,7 +15,8 @@ fi
 # Major Version (eg, 8)
 MAJ=${RLVER}
 
-cd "${RELEASE_COMPOSE_ROOT}/compose" || { echo "Failed to change directory"; ret_val=1; exit 1; }
+#cd "${RELEASE_COMPOSE_ROOT}/compose" || { echo "Failed to change directory"; ret_val=1; exit 1; }
+cd "${RELEASE_COMPOSE_ROOT}/" || { echo "Failed to change directory"; ret_val=1; exit 1; }
 ret_val=$?
 
 if [ $ret_val -eq "0" ]; then
@@ -23,17 +24,17 @@ if [ $ret_val -eq "0" ]; then
   mkdir -p "${TARGET}"
   # disabling because none of our files should be starting with dashes. If they
   # are something is *seriously* wrong here.
-  # shellcheck disable=SC2035
-  sudo -l && find **/* -maxdepth 0 -type d | parallel --will-cite -j 18 sudo rsync -av --chown=10004:10005 --progress --relative --human-readable --delete \
-      {} "${TARGET}"
+  #sudo -l && find **/* -maxdepth 0 -type d | parallel --will-cite -j 18 sudo rsync -av --chown=10004:10005 --progress --relative --human-readable --delete \
+  #    {} "${TARGET}"
 
   # This is temporary until we implement rsync into empanadas
-  if [ -f "COMPOSE_ID" ]; then
-    cp COMPOSE_ID "${TARGET}"
-    chown 10004:10005 "${TARGET}/COMPOSE_ID"
-  fi
+  #if [ -f "COMPOSE_ID" ]; then
+  #  cp COMPOSE_ID "${TARGET}"
+  #  chown 10004:10005 "${TARGET}/COMPOSE_ID"
+  #fi
 
-  if [ -d "metadata" ]; then
-    rsync -av --chown=10004:10005 --progress --relative --human-readable metadata "${TARGET}"
-  fi
+  #if [ -d "metadata" ]; then
+  #  rsync -av --chown=10004:10005 --progress --relative --human-readable metadata "${TARGET}"
+  #fi
+  rsync_delete_staging "${TARGET}"
 fi
diff --git a/sync/sync-to-staging.sh b/sync/sync-to-staging.sh
index 156e4d3..2775835 100644
--- a/sync/sync-to-staging.sh
+++ b/sync/sync-to-staging.sh
@@ -15,27 +15,28 @@ fi
 # Major Version (eg, 8)
 MAJ=${RLVER}
 
-cd "${RELEASE_COMPOSE_ROOT}/compose" || { echo "Failed to change directory"; ret_val=1; exit 1; }
+#cd "${RELEASE_COMPOSE_ROOT}/compose" || { echo "Failed to change directory"; ret_val=1; exit 1; }
+cd "${RELEASE_COMPOSE_ROOT}/" || { echo "Failed to change directory"; ret_val=1; exit 1; }
 ret_val=$?
 
 if [ $ret_val -eq "0" ]; then
   TARGET="${STAGING_ROOT}/${CATEGORY_STUB}/${REV}"
   mkdir -p "${TARGET}"
+  rsync_no_delete_staging "${TARGET}"
   # disabling because none of our files should be starting with dashes. If they
   # are something is *seriously* wrong here.
-  # shellcheck disable=SC2035
-  sudo -l && find **/* -maxdepth 0 -type d | parallel --will-cite -j 18 sudo rsync -av --chown=10004:10005 --progress --relative --human-readable \
-      {} "${TARGET}"
+  #sudo -l && find **/* -maxdepth 0 -type d | parallel --will-cite -j 18 sudo rsync -av --chown=10004:10005 --progress --relative --human-readable \
+  #    {} "${TARGET}"
 
   # This is temporary until we implement rsync into empanadas
-  if [[ "${COMPOSE}" == "Rocky" ]]; then
-    if [ -f "COMPOSE_ID" ]; then
-      cp COMPOSE_ID "${TARGET}"
-      chown 10004:10005 "${TARGET}/COMPOSE_ID"
-    fi
+  #if [[ "${COMPOSE}" == "Rocky" ]]; then
+  #  if [ -f "COMPOSE_ID" ]; then
+  #    cp COMPOSE_ID "${TARGET}"
+  #    chown 10004:10005 "${TARGET}/COMPOSE_ID"
+  #  fi
 
-    if [ -d "metadata" ]; then
-      rsync -av --chown=10004:10005 --progress --relative --human-readable metadata "${TARGET}"
-    fi
-  fi
+#    if [ -d "metadata" ]; then
+#      rsync -av --chown=10004:10005 --progress --relative --human-readable metadata "${TARGET}"
+#    fi
+#  fi
 fi