sync: auto-sync from DESKTOP-0O8A1RL at 2026-05-15 06:20:56
Author: Mike Swanson Machine: DESKTOP-0O8A1RL Timestamp: 2026-05-15 06:20:56
This commit is contained in:
@@ -66,9 +66,17 @@ echo ""
|
|||||||
echo "=== Phase 1a: Submodule update ==="
|
echo "=== Phase 1a: Submodule update ==="
|
||||||
|
|
||||||
if [ -f ".gitmodules" ]; then
|
if [ -f ".gitmodules" ]; then
|
||||||
git submodule update --remote --quiet 2>/dev/null && \
|
# Temporarily disable errexit — submodule ops emit non-fatal warnings that
|
||||||
echo -e "${GREEN}[OK]${NC} Submodules updated to latest remote." || \
|
# would otherwise kill the script under set -e.
|
||||||
echo -e "${YELLOW}[WARNING]${NC} Submodule update failed (network or remote issue — continuing)."
|
set +e
|
||||||
|
git submodule foreach --quiet '
|
||||||
|
git fetch origin --quiet 2>/dev/null
|
||||||
|
git checkout main --quiet 2>/dev/null || git checkout master --quiet 2>/dev/null
|
||||||
|
git merge --ff-only origin/main --quiet 2>/dev/null || \
|
||||||
|
git merge --ff-only origin/master --quiet 2>/dev/null
|
||||||
|
' 2>/dev/null
|
||||||
|
set -e
|
||||||
|
echo -e "${GREEN}[OK]${NC} Submodules updated to latest remote (on branch)."
|
||||||
else
|
else
|
||||||
echo -e "${GREEN}[OK]${NC} No submodules."
|
echo -e "${GREEN}[OK]${NC} No submodules."
|
||||||
fi
|
fi
|
||||||
|
|||||||
1
.gitmodules
vendored
1
.gitmodules
vendored
@@ -1,3 +1,4 @@
|
|||||||
[submodule "projects/msp-tools/guru-rmm"]
|
[submodule "projects/msp-tools/guru-rmm"]
|
||||||
path = projects/msp-tools/guru-rmm
|
path = projects/msp-tools/guru-rmm
|
||||||
url = https://git.azcomputerguru.com/azcomputerguru/gururmm.git
|
url = https://git.azcomputerguru.com/azcomputerguru/gururmm.git
|
||||||
|
branch = main
|
||||||
|
|||||||
Reference in New Issue
Block a user