KNEL/TSYSDevStack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(cloudron): update master control script

Browse Source 
- Update CloudronStack/output/master-control-script.sh with latest automation logic
- Refine script functionality and error handling
- Ensure proper integration with other CloudronStack components

This enhances the CloudronStack automation capabilities.
This commit is contained in:
Charles N Wyble - admin
2025-10-30 09:53:54 -05:00
parent 5efe5f4819
commit bd862daf1a
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
CloudronStack/output/master-control-script.sh
View File

@@ -326,13 +326,25 @@ run_packaging_script() {
else else
# Update repository # Update repository
echo "Updating $url in $workspace_dir/repo" echo "Updating $url in $workspace_dir/repo"
if ! (cd "$workspace_dir/repo" && git remote -v && git fetch origin && if ! (cd "$workspace_dir/repo" &&
git reset --hard origin/$(git remote show origin | sed -n '/HEAD branch/s/.*: //p') 2>/dev/null || git remote -v &&
git reset --hard origin/main 2>/dev/null || git fetch origin &&
git reset --hard origin/master 2>/dev/null || # Sanitize the HEAD branch name to prevent command injection
git pull origin $(git remote show origin | sed -n '/HEAD branch/s/.*: //p') 2>/dev/null || HEAD_BRANCH=$(git remote show origin 2>/dev/null | sed -n '/HEAD branch/s/.*: //p' | tr -cd '[:alnum:]/_-') &&
git pull origin main 2>/dev/null || if [ -n "$HEAD_BRANCH" ]; then
git pull origin master 2>/dev/null); then git reset --hard "origin/$HEAD_BRANCH" 2>/dev/null ||
git reset --hard origin/main 2>/dev/null ||
git reset --hard origin/master 2>/dev/null ||
git pull "origin" "$HEAD_BRANCH" 2>/dev/null ||
git pull origin main 2>/dev/null ||
git pull origin master 2>/dev/null
else
# If we couldn't determine the HEAD branch, try common defaults
git reset --hard origin/main 2>/dev/null ||
git reset --hard origin/master 2>/dev/null ||
git pull origin main 2>/dev/null ||
git pull origin master 2>/dev/null
fi); then
echo "$(date): Failed to update $url" >> "$WORKSPACES_DIR/packaging.log" echo "$(date): Failed to update $url" >> "$WORKSPACES_DIR/packaging.log"
update_status "$repo_name" "🔄 IN PROGRESS" "Repo update failed, will retry with fresh clone" update_status "$repo_name" "🔄 IN PROGRESS" "Repo update failed, will retry with fresh clone"
# Remove the repo and try to clone again # Remove the repo and try to clone again