Merge pull request #94 from github-samples/windows-updates

Windows updates

Author: chrisreddington

content/1-hour/README.md

@@ -34,6 +34,7 @@ You will also need the following available and installed locally:
 
 - A recent [Node.js runtime][nodejs-link].
 - A recent version of [Python][python-link].
+  - For Windows, you can install [Python via the Windows store](https://apps.microsoft.com/detail/9pjpw5ldxlz5?hl=en-US&gl=US).
 - The [git CLI][git-link].
 - A shell capable of running BASH commands.
 
@@ -65,5 +66,6 @@ Ready to get started? Let's go! The workshop scenario imagines you as a develope
 [stage-4]: ./4-add-feature.md
 [walkthrough-previous]: ../README.md
 [walkthrough-next]: ./0-setup.md
+[windows-python-link]: https://apps.microsoft.com/detail/9pjpw5ldxlz5
 [windows-subsystem-linux]: https://learn.microsoft.com/en-us/windows/wsl/about
 [vscode-link]: https://code.visualstudio.com/

scripts/start-app.sh

@@ -14,8 +14,17 @@ fi
 
 echo "Starting API (Flask) server..."
 
-python3 -m venv venv
-source venv/bin/activate
+# Check OS and use appropriate Python command
+if [[ "$OSTYPE" == "msys" ]] || [[ "$OSTYPE" == "win32" ]]; then
+    # Windows
+    py -m venv venv
+    source venv/Scripts/activate || . venv/Scripts/activate
+else
+    # macOS/Linux
+    python3 -m venv venv
+    source venv/bin/activate || . venv/bin/activate
+fi
+
 pip install -r server/requirements.txt
 cd server || {
     echo "Error: server directory not found"
@@ -24,7 +33,13 @@ cd server || {
 }
 export FLASK_DEBUG=1
 export FLASK_PORT=5100
-python app.py &
+
+# Use appropriate Python command based on OS
+if [[ "$OSTYPE" == "msys" ]] || [[ "$OSTYPE" == "win32" ]]; then
+    py app.py &
+else
+    python3 app.py &
+fi
 
 # Store the Python server process ID
 SERVER_PID=$!
@@ -53,13 +68,43 @@ echo "Ctl-C to stop the servers"
 # Function to handle script termination
 cleanup() {
     echo "Shutting down servers..."
-    kill $SERVER_PID
-    kill $CLIENT_PID
+    
+    # Kill processes and their child processes
+    if [[ "$OSTYPE" == "msys" ]] || [[ "$OSTYPE" == "win32" ]]; then
+        taskkill //F //T //PID $SERVER_PID 2>/dev/null
+        taskkill //F //T //PID $CLIENT_PID 2>/dev/null
+    else
+        # Send SIGTERM first to allow graceful shutdown
+        kill -TERM $SERVER_PID 2>/dev/null
+        kill -TERM $CLIENT_PID 2>/dev/null
+        
+        # Wait briefly for graceful shutdown
+        sleep 2
+        
+        # Then force kill if still running
+        if ps -p $SERVER_PID > /dev/null 2>&1; then
+            pkill -P $SERVER_PID 2>/dev/null
+            kill -9 $SERVER_PID 2>/dev/null
+        fi
+        
+        if ps -p $CLIENT_PID > /dev/null 2>&1; then
+            pkill -P $CLIENT_PID 2>/dev/null
+            kill -9 $CLIENT_PID 2>/dev/null
+        fi
+    fi
+
+    # Deactivate virtual environment if active
+    if [[ -n "${VIRTUAL_ENV}" ]]; then
+        deactivate
+    fi
+
+    # Return to initial directory
+    cd "$INITIAL_DIR"
     exit 0
 }
 
-# Trap SIGINT (Ctrl+C) and SIGTERM
-trap cleanup SIGINT SIGTERM
+# Trap multiple signals
+trap cleanup SIGINT SIGTERM SIGQUIT EXIT
 
 # Keep the script running
 wait