Skip to content

Commit 3163bab

Browse files
authored
Merge pull request #11 from ryanmac/feature/installer-environment-selection
Fix installer commit timing to include all configuration changes
2 parents d001a3e + 5df6fb7 commit 3163bab

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

conductor-init.sh

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -184,24 +184,7 @@ fi
184184
echo -e "${GREEN}✅ Setup complete.${NC}"
185185
echo ""
186186

187-
# Step 5: Auto-commit generated files (with user consent)
188-
echo -e "${YELLOW}📝 Committing generated files to Git...${NC}"
189-
git add .conductor .github setup.py requirements.txt pyproject.toml VERSION 2>/dev/null
190-
if git diff --staged --quiet; then
191-
echo -e "${GREEN}✅ No changes to commit (files already in Git).${NC}"
192-
else
193-
read -p "Commit these changes automatically? [Y/n]: " -n 1 -r
194-
echo ""
195-
if [[ $REPLY =~ ^[Yy]$ ]] || [[ -z $REPLY ]]; then
196-
git commit -m "Initialize Code Conductor setup" || echo -e "${YELLOW}⚠️ Commit failed.${NC}"
197-
echo -e "${GREEN}✅ Changes committed.${NC}"
198-
else
199-
echo -e "${YELLOW}⚠️ Skipping commit. Remember to commit manually.${NC}"
200-
fi
201-
fi
202-
echo ""
203-
204-
# Step 6: Interactive Role Configuration (improved: numbered menu)
187+
# Step 5: Interactive Role Configuration (improved: numbered menu)
205188
echo -e "${YELLOW}🎭 Configuring agent roles...${NC}"
206189

207190
# Read detected stacks from config
@@ -319,7 +302,7 @@ EOF
319302
fi
320303
fi
321304

322-
# Step 7: Seed Demo Tasks
305+
# Step 6: Seed Demo Tasks
323306
echo ""
324307
echo -e "${YELLOW}📝 Creating demo tasks...${NC}"
325308

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

352+
# Step 7: Auto-commit all generated files (with user consent)
353+
echo ""
354+
echo -e "${YELLOW}📝 Committing all generated files to Git...${NC}"
355+
git add .conductor .github setup.py requirements.txt pyproject.toml VERSION 2>/dev/null
356+
if git diff --staged --quiet; then
357+
echo -e "${GREEN}✅ No changes to commit (files already in Git).${NC}"
358+
else
359+
read -p "Commit these changes automatically? [Y/n]: " -n 1 -r
360+
echo ""
361+
if [[ $REPLY =~ ^[Yy]$ ]] || [[ -z $REPLY ]]; then
362+
git commit -m "Initialize Code Conductor setup with configuration" || echo -e "${YELLOW}⚠️ Commit failed.${NC}"
363+
echo -e "${GREEN}✅ Changes committed.${NC}"
364+
else
365+
echo -e "${YELLOW}⚠️ Skipping commit. Remember to commit manually.${NC}"
366+
fi
367+
fi
368+
369369
# Step 8: Development Environment Selection
370370
echo ""
371371
echo -e "${YELLOW}🖥️ Select your primary development environment:${NC}"

0 commit comments

Comments
 (0)