simplying setup files and remove runCommand

Author: abhishekblue

src/install/setupDocker.ts

@@ -1,6 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { execSync } from 'node:child_process';
+import inquirer from 'inquirer';
 
 const ROOT_DIR = process.cwd();
 const ENV_DEV_SOURCE = path.join(ROOT_DIR, 'envFiles', '.env.devcontainer');
@@ -37,7 +38,7 @@ async function main() {
   if (process.platform === 'linux') {
     console.log('\n🔧 Adding user to docker group...');
     console.log('DEBUG: process.platform =', process.platform);
-    execSync('sudo usermod -a -G docker $USER}');
+    execSync('sudo usermod -a -G docker $USER');
     console.log('==========sud command check 1===========')
     execSync ('sudo su $USER -')
     console.log('==========sud command check ===========')
@@ -50,6 +51,29 @@ async function main() {
   console.log('\n🚀 Starting DevContainer...');
   execSync('devcontainer up --workspace-folder .');
 
+  console.log('\n📊 Applying database migrations...');
+  execSync('pnpm run apply_drizzle_migrations');
+
+  const dataAnswer = await inquirer.prompt([
+    {
+      type: 'confirm',
+      name: 'addSampleData',
+      message: 'Do you want to seed the database with sample data?',
+      default: true,
+    },
+  ]);
+
+  if (dataAnswer.addSampleData) {
+    console.log('\n🌱 Seeding Sample Data...');
+    try {
+      execSync(`docker exec talawa-api-1 /bin/bash -c 'pnpm run add:sample_data'`, { stdio: 'inherit' });
+      console.log('✅ Sample data seeded successfully');
+    } catch (error) {
+      console.log('⚠️  Sample data seeding failed, but you can run it manually later:');
+      console.log(`    docker exec talawa-api-1 /bin/bash -c 'pnpm run add:sample_data'`);
+    }
+  }
+
   console.log('\n🚀 Starting API Server...');
   execSync('docker exec talawa-api-1 /bin/bash -c "nohup pnpm run start_development_server > /dev/null 2>&1 &"');
 
@@ -58,13 +82,9 @@ async function main() {
 
   console.log('\n✅ DevContainer Setup Complete!');
   console.log('------------------------------------------------');
-  console.log('✓ API Server is running at: http://localhost:4000');
+  console.log('✓ API Server is running in detached mode at: http://localhost:4000');
   console.log('✓ GraphQL Playground: http://localhost:4000/graphql');
-  console.log('');
-  console.log('Useful Commands:');
-  console.log('  View logs:    docker logs -f talawa-api-1');
-  console.log('  Stop server:  docker exec talawa-api-1 pkill -f "pnpm run start_development_server"');
-  console.log('  Restart:      docker restart talawa-api-1');
+  console.log('  Stop server:  docker compose down');
   console.log('------------------------------------------------');
 }
 

src/install/setupLocal.ts

@@ -16,24 +16,6 @@ const needsSudoForDocker = (): boolean => {
   }
 };
 
-const runCommand = (command: string, throwOnError = true) => {
-  try {
-    let finalCommand = command;
-    if (command.includes('docker') && needsSudoForDocker()) {
-      finalCommand = `sudo ${command}`;
-      console.log('ℹ️  Using sudo for Docker commands (run without sudo after logging out/in)');
-    }
-    execSync(finalCommand, { stdio: 'inherit', cwd: ROOT_DIR, env: process.env });
-  } catch (error) {
-    console.error(`❌ Command failed: ${command}`);
-    if (throwOnError) {
-      process.exit(1);
-    } else {
-      throw error;
-    }
-  }
-};
-
 async function main() {
   console.log('\n🚀 Talawa API Local Setup\n');
 
@@ -45,7 +27,7 @@ async function main() {
   }
 
   console.log('\n⚙️  Running database setup (generating JWT secret, configuring services)...');
-  runCommand('pnpm tsx setup.ts');
+  execSync('pnpm tsx setup.ts');
 
   console.log('\n🔄 Adjusting .env for local machine access...');
   let envContent = fs.readFileSync(ENV_DEST, 'utf-8');
@@ -83,18 +65,18 @@ async function main() {
   console.log('✅ .env updated: Database services point to localhost');
 
   console.log('\n📦 Installing DevContainer CLI...');
-  runCommand('pnpm install -g @devcontainers/cli');
+  execSync('pnpm install -g @devcontainers/cli');
 
   // Add user to docker group if needed (Linux only)
   if (process.platform === 'linux' && needsSudoForDocker()) {
     console.log('\n🔧 Adding user to docker group...');
-    const username = process.env.USER || process.env.USERNAME || 'ubuntu';
-    runCommand(`sudo usermod -a -G docker ${username}`);
+    execSync('sudo usermod -a -G docker $USER');
+    execSync('sudo su $USER -')
     console.log('ℹ️  You may need to log out and back in for docker group changes to take effect');
   }
 
   console.log('\n🐳 Starting Database Containers...');
-  runCommand('devcontainer up --workspace-folder . --skip-post-create');
+  execSync('devcontainer up --workspace-folder . --skip-post-create');
 
   console.log('\n⏳ Waiting for database services to be healthy...');
   let retries = 10;
@@ -114,7 +96,7 @@ async function main() {
   }
 
   console.log('\n📊 Applying database migrations...');
-  runCommand('pnpm run apply_drizzle_migrations');
+  execSync('pnpm run apply_drizzle_migrations');
 
   const dataAnswer = await inquirer.prompt([
     {
@@ -128,32 +110,19 @@ async function main() {
   if (dataAnswer.addSampleData) {
     console.log('\n🌱 Seeding Sample Data...');
     try {
-      runCommand('pnpm run add:sample_data', false);
+      execSync('pnpm run add:sample_data', { stdio: 'inherit' });
       console.log('✅ Sample data seeded successfully');
     } catch (error) {
       console.log('⚠️  Sample data seeding failed, but you can run it manually later:');
       console.log('   pnpm run add:sample_data');
     }
   }
 
-  const startAnswer = await inquirer.prompt([
-    {
-      type: 'confirm',
-      name: 'startServer',
-      message: 'Do you want to start the development server now?',
-      default: true,
-    },
-  ]);
-
-  if (startAnswer.startServer) {
-    console.log('\n🚀 Starting Development Server...');
-    try {
-      execSync('pnpm run start_development_server', { stdio: 'inherit' });
-    } catch (e) {
-      console.log('\nServer stopped.');
-    }
-  } else {
-    console.log('⚠️  Restart your terminal to use pnpm manually.');
+  console.log('\n🚀 Starting Development Server...');
+  try {
+    execSync('pnpm run start_development_server', { stdio: 'inherit' });
+  } catch (e) {
+    console.log('\nServer stopped.');
   }
 }