Updated upgrade script to skip confirmation for shad add in bash

Author: jamiefeiss

scripts/upgrade.ps1

@@ -112,12 +112,14 @@ $templateShadComponents = (Get-ChildItem -Path app/components/ui).name
 $diffComponents = $shadComponents | Where-Object {$templateShadComponents -NotContains $_}
 
 invoke-npmCommand -command "exec --" -pnpmCommand "dlx" -argslist "nuxi prepare"
-
-invoke-npmCommand -command "exec --" -pnpmCommand "dlx" -argslist "shadcn-vue@latest add $diffComponents"
+if ($diffComponents.Length -gt 0) {
+    write-output  "Choose no (N) to overriding components if prompted below"
+    invoke-npmCommand -command "exec --" -pnpmCommand "dlx" -argslist "shadcn-vue@latest add $diffComponents"
+}
 
 write-output  "-----------------------------"
 write-output  "Upgrade complete!"
 write-output  "The next step is to convert your Tailwind CSS variables saved in 'tailwind.txt'"
 write-output  "Follow step 9 in the upgrade guide"
 write-output  "https://github.com/RDFLib/prez-ui/blob/feature/tailwind4/docs/upgrade.md#9-update-tailwindcss"
-write-output  "(Note: You may need to remove the prez-ui folder as it may not have been deleted properly)"
+write-output  "(Note: You may need to remove the prez-ui folder as it may not have been deleted properly)"

scripts/upgrade.sh

@@ -7,6 +7,12 @@ fi
 MAC_OS=$([ $(uname -s) == Darwin ] && echo true || echo false)
 USE_PNPM=$([ -f pnpm-lock.yaml ] && echo true || echo false)
 
+if $USE_PNPM; then
+    MANAGER="pnpm"
+else
+    MANAGER="npm"
+fi
+
 if $MAC_OS; then
     SED_FLAGS=( -i '' )
 else
@@ -15,21 +21,21 @@ fi
 
 # 1. Uninstall old packages
 REMOVE_PACKAGES=(@nuxtjs/tailwindcss radix-vue tailwindcss-animate prez-ui)
-if $USE_PNPM; then
-    pnpm remove "${REMOVE_PACKAGES[@]}"
-else
-    npm uninstall "${REMOVE_PACKAGES[@]}"
-fi
+
+for package in "${REMOVE_PACKAGES[@]}"; do
+    if $MANAGER list --depth=0 | grep $package; then
+        if $USE_PNPM; then
+            pnpm remove $package
+        else
+            npm uninstall $package
+        fi
+    fi
+done
 
 # 2. Update packages
 UPDATE_PACKAGES=(tailwind-merge nuxt shadcn-nuxt)
-
 PREZ_PACKAGES=(prez-lib prez-components)
-if $USE_PNPM; then
-    MANAGER="pnpm"
-else
-    MANAGER="npm"
-fi
+
 for package in "${PREZ_PACKAGES[@]}"; do
     if $MANAGER list --depth=0 | grep $package; then
         UPDATE_PACKAGES+=($package)
@@ -117,9 +123,9 @@ else
 fi
 
 if $USE_PNPM; then
-    pnpm dlx shadcn-vue@latest add "${DIFF_COMPONENTS[@]}"
+    yes n | pnpm dlx shadcn-vue@latest add "${DIFF_COMPONENTS[@]}"
 else
-    npx shadcn-vue@latest add "${DIFF_COMPONENTS[@]}"
+    yes n | npx shadcn-vue@latest add "${DIFF_COMPONENTS[@]}"
 fi
 
 echo "-----------------------------"