Check .nonadmin to set shortcut path

spyder-ide · Jul 14, 2023 · 4b2fcb3 · 4b2fcb3
1 parent d515de3
commit 4b2fcb3
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/.github/workflows/installers-conda.yml b/.github/workflows/installers-conda.yml
@@ -254,13 +254,17 @@ jobs:
 
           installer -pkg $PKG_PATH -target CurrentUserHomeDirectory >/dev/null
 
+          root_prefix=$(compgen -G $HOME/Library/spyder-*)
+
           echo "Install info:"
-          echo "Contents of" $HOME/Library/spyder-* :
-          ls -al $HOME/Library/spyder-*
-          echo -e "\nContents of" $HOME/Library/spyder-*/uninstall-spyder.sh :
-          cat $HOME/Library/spyder-*/uninstall-spyder.sh
+          echo "Contents of ${root_prefix}:"
+          ls -al $root_prefix
+          echo -e "\nContents of ${root_prefix}/uninstall-spyder.sh:"
+          cat $root_prefix/uninstall-spyder.sh
+
+          app_path=/Applications/Spyder.app
+          [[ -e ${root_prefix}/.nonadmin ]] && app_path=${HOME}${app_path}
 
-          app_path=$HOME/Applications/Spyder.app
           if [[ -e "$app_path" ]]; then
               echo "Contents of $app_path/Contents/MacOS:"
               ls -al $app_path/Contents/MacOS
@@ -278,20 +282,20 @@ jobs:
         run: |
           $PKG_PATH -b
 
+          root_prefix=$(compgen -G $HOME/.local/spyder-*)
+
           echo "Install info:"
-          echo "Contents of" $HOME/.local/spyder-* :
-          ls -al $HOME/.local/spyder-*
-          echo -e "\nContents of" $HOME/.local/spyder-*/uninstall-spyder.sh :
-          cat $HOME/.local/spyder-*/uninstall-spyder.sh
+          echo "Contents of ${root_prefix}:"
+          ls -al $root_prefix
+          echo -e "\nContents of ${root_prefix}/uninstall-spyder.sh:"
+          cat ${root_prefix}/uninstall-spyder.sh
+
+          shortcut_path=/.local/share/applications/spyder_spyder.desktop
+          [[ -e ${root_prefix}/.nonadmin ]] && shortcut_path=${HOME}${shortcut_path} || shortcut_path=/usr${shortcut_path}
 
-          shortcut_path=$HOME/.local/share/applications/spyder_spyder.desktop
           if [[ -e $shortcut_path ]]; then
-              echo "Contents of" $HOME/.local/spyder-* :
-              ls -al $HOME/.local/spyder-*
               echo -e "\nContents of ${shortcut_path}:"
               cat $shortcut_path
-              echo -e "\nContents of" $HOME/.local/spyder-*/uninstall-spyder.sh :
-              cat $HOME/.local/spyder-*/uninstall-spyder.sh
           else
               echo "$shortcut_path does not exist"
               exit 1