Merge branch 'main' into pf-3928

Author: dlabaj

scripts/install.sh

@@ -2,6 +2,11 @@
 # Install Node (via nvm + Node.js 24 when Node is missing), enable Corepack,
 # install GitHub CLI when missing, and install @patternfly/patternfly-cli globally.
 
+# Ensure this script runs in bash, even if invoked with zsh
+if [ -z "${BASH_VERSION:-}" ]; then
+  exec bash "$0" "$@"
+fi
+
 set -euo pipefail
 
 if [ -z "${HOME:-}" ]; then
@@ -48,6 +53,40 @@ ensure_nvm_loaded() {
   return 1
 }
 
+setup_nvm_for_zsh() {
+  # Add nvm to .zshrc only if zsh is the user's default shell
+  if [ -z "${SHELL:-}" ]; then
+    return 0
+  fi
+
+  case "$SHELL" in
+    */zsh)
+      ;;
+    *)
+      return 0
+      ;;
+  esac
+
+  local zshrc="${HOME}/.zshrc"
+  if [ ! -f "$zshrc" ]; then
+    touch "$zshrc"
+  fi
+
+  if grep -q 'NVM_DIR' "$zshrc" 2>/dev/null; then
+    info "nvm is already configured in ${zshrc}"
+    return 0
+  fi
+
+  info "Adding nvm to ${zshrc} for zsh compatibility."
+  cat >> "$zshrc" << 'EOF'
+
+# Load nvm (Node Version Manager)
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
+EOF
+}
+
 install_node_via_nvm() {
   info "Node.js not found. Installing nvm (${NVM_VERSION}) and Node.js 24."
   if ! require_cmd curl && ! require_cmd wget; then
@@ -71,6 +110,8 @@ install_node_via_nvm() {
   nvm use 24 || error "nvm failed to activate Node.js 24."
   nvm alias default 24 2>/dev/null || true
 
+  setup_nvm_for_zsh
+
   info "Node.js $(node --version) and npm $(npm --version) are ready (npm ships with this Node release)."
 }
 
@@ -245,16 +286,21 @@ main() {
   ensure_gh
   install_patternfly_cli
 
+  printf '\n'
+  printf 'SUCCESS: PatternFly CLI is installed.\n'
+  printf '\n'
   printf 'To see available commands, run the CLI with:\n'
   printf '  patternfly-cli --help\n'
   printf '\n'
   printf 'Alternatively, you can use the alias "pfcli" instead of "patternfly-cli"\n'
   printf '\n'
   printf '  pfcli --help\n'
   printf '\n'
-  printf 'SUCCESS: PatternFly CLI is installed.\n'
+  printf 'NOTE: If the command is not found, restart your terminal or run:\n'
+  printf '  source ~/.zshrc    # for zsh users\n'
+  printf '  source ~/.bashrc   # for bash users\n'
   printf '\n'
-  
+
 }
 
 main "$@"

src/__tests__/create.test.ts

@@ -152,7 +152,7 @@ describe('runCreate', () => {
     expect(mockExeca).toHaveBeenNthCalledWith(
       1,
       'git',
-      ['clone', starter!.repo, projectPath],
+      ['clone', ...(starter!.options ?? []), starter!.repo, projectPath],
       expect.objectContaining({ stdio: 'inherit' })
     );
   });
@@ -166,7 +166,7 @@ describe('runCreate', () => {
     expect(mockExeca).toHaveBeenNthCalledWith(
       1,
       'git',
-      ['clone', starter!.repoSSH, projectPath],
+      ['clone', ...(starter!.options ?? []), starter!.repoSSH, projectPath],
       expect.objectContaining({ stdio: 'inherit' })
     );
   });
@@ -225,7 +225,7 @@ describe('runCreate', () => {
 
     expect(mockExeca).toHaveBeenNthCalledWith(
       2,
-      'yarn',
+      'npm',
       ['install'],
       expect.objectContaining({ cwd: projectPath, stdio: 'inherit' })
     );

src/templates.ts

@@ -19,7 +19,8 @@ export const defaultTemplates: Template[] = [
         description: "A starter template for Patternfly react typescript project",
         repo: "https://github.com/patternfly/patternfly-react-seed.git",
         repoSSH: "git@github.com:patternfly/patternfly-react-seed.git",
-        packageManager: "yarn"
+        options: ["--single-branch", "--branch", "main"],
+        packageManager: "npm"
     },
     {
         name: "compass-starter",