Accommodate bundle name with spaces and properly quote variable expan…

…sion to get correct sed options for BSD
mrclary · Jan 25, 2024 · 94f3e7c · 94f3e7c
1 parent b26aa69
commit 94f3e7c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/installers-conda.yml b/.github/workflows/installers-conda.yml
@@ -252,12 +252,12 @@ jobs:
           cat $base_prefix/uninstall-spyder.sh
 
           if [[ -e "$shortcut" ]]; then
-              echo "Contents of $shortcut/Contents/MacOS:"
-              ls -al $shortcut/Contents/MacOS
+              echo "$shortcut/Contents/MacOS contents:"
+              ls -al "$shortcut/Contents/MacOS"
               echo -e "\nContents of $shortcut/Contents/Info.plist:"
-              cat $shortcut/Contents/Info.plist
-              echo -e "\nContents of $shortcut/Contents/MacOS/spyder-script:"
-              cat $shortcut/Contents/MacOS/spyder-script
+              cat "$shortcut/Contents/Info.plist"
+              echo -e "\n$shortcut/Contents/MacOS/spyder"*-script contents:
+              cat "$shortcut/Contents/MacOS/spyder"*-script
           else
               echo "$shortcut does not exist"
               exit 1

diff --git a/installers-conda/resources/post-install.sh b/installers-conda/resources/post-install.sh
@@ -46,7 +46,7 @@ add_alias() {
     fi
 
     # BSD sed does not like semicolons; newlines work for both BSD and GNU.
-    sed ${sed_opts[@]} "
+    sed "${sed_opts[@]}" "
     /$m1/,/$m2/{
         h
         /$m2/ s|.*|$m1\n$alias_text\n$m2|