Skip to content

Fix installer commit timing to include all configuration changes #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanmac merged 1 commit into from
Jul 23, 2025
Merged

Fix installer commit timing to include all configuration changes #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions conductor-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,24 +184,7 @@ fi
echo -e "${GREEN}✅ Setup complete.${NC}"
echo ""

# Step 5: Auto-commit generated files (with user consent)
echo -e "${YELLOW}📝 Committing generated files to Git...${NC}"
git add .conductor .github setup.py requirements.txt pyproject.toml VERSION 2>/dev/null
if git diff --staged --quiet; then
echo -e "${GREEN}✅ No changes to commit (files already in Git).${NC}"
else
read -p "Commit these changes automatically? [Y/n]: " -n 1 -r
echo ""
if [[ $REPLY =~ ^[Yy]$ ]] || [[ -z $REPLY ]]; then
git commit -m "Initialize Code Conductor setup" || echo -e "${YELLOW}⚠️ Commit failed.${NC}"
echo -e "${GREEN}✅ Changes committed.${NC}"
else
echo -e "${YELLOW}⚠️ Skipping commit. Remember to commit manually.${NC}"
fi
fi
echo ""

# Step 6: Interactive Role Configuration (improved: numbered menu)
# Step 5: Interactive Role Configuration (improved: numbered menu)
echo -e "${YELLOW}🎭 Configuring agent roles...${NC}"

# Read detected stacks from config
Expand Down Expand Up @@ -319,7 +302,7 @@ EOF
fi
fi

# Step 7: Seed Demo Tasks
# Step 6: Seed Demo Tasks
echo ""
echo -e "${YELLOW}📝 Creating demo tasks...${NC}"

Expand Down Expand Up @@ -366,6 +349,23 @@ else:
" || echo -e "${YELLOW}⚠️ Could not create demo tasks.${NC}"
fi

# Step 7: Auto-commit all generated files (with user consent)
echo ""
echo -e "${YELLOW}📝 Committing all generated files to Git...${NC}"
git add .conductor .github setup.py requirements.txt pyproject.toml VERSION 2>/dev/null
if git diff --staged --quiet; then
echo -e "${GREEN}✅ No changes to commit (files already in Git).${NC}"
else
read -p "Commit these changes automatically? [Y/n]: " -n 1 -r
echo ""
if [[ $REPLY =~ ^[Yy]$ ]] || [[ -z $REPLY ]]; then
git commit -m "Initialize Code Conductor setup with configuration" || echo -e "${YELLOW}⚠️ Commit failed.${NC}"
echo -e "${GREEN}✅ Changes committed.${NC}"
else
echo -e "${YELLOW}⚠️ Skipping commit. Remember to commit manually.${NC}"
fi
fi

# Step 8: Development Environment Selection
echo ""
echo -e "${YELLOW}🖥️ Select your primary development environment:${NC}"
Expand Down
Loading