menuinst now provides python symbolic link.

Add symbolic link directive to json.
Post-install script for macOS now obsolete.
Constructor variable replacement does not apply to Linux.

Author: mrclary

installers-conda/build_installers.py

@@ -278,7 +278,6 @@ def _definitions():
                 "welcome_file": str(welcome_file),
                 "conclusion_text": "",
                 "readme_text": "",
-                "post_install": str(RESOURCES / "post-install.sh"),
             }
         )
 

installers-conda/resources/post-install.sh

@@ -1,74 +1,46 @@
 #!/bin/bash
 set -e
 
-echo "*** Running post install script for __NAME__ ..."
-
-cat <<EOF
-* __PKG_NAME_LOWER__
-* __NAME__
-* __VERSION__
-* __CHANNELS__
-* __WRITE_CONDARC__
-* __SHORTCUTS__
-* __DEFAULT_PREFIX__
-* __LICENSE__
-* __FIRST_PAYLOAD_SIZE__
-* __SECOND_PAYLOAD_SIZE__
-* __MD5__
-* __INSTALL_COMMANDS__
-* __PLAT__
-* __NAME_LOWER__
-EOF
+echo "*** Running post install script for ${INSTALLER_NAME} ..."
 
 echo "Args = $@"
 echo "$(declare -p)"
 
-if [[ $OSTYPE == "darwin"* ]]; then
-    # macOS
-    ENV_PREFIX=$(cd "${PREFIX}/envs/__NAME_LOWER__"; pwd)
-    shortcut_path="$(dirname ${DSTROOT})/Applications/__NAME__.app"
+name_lower=${INSTALLER_NAME,,}
+_shortcut_path="$HOME/.local/share/applications/${name_lower}_${name_lower}.desktop"
+shortcut_path="$(dirname ${_shortcut_path})/${name_lower}.desktop"
+if [[ -e ${_shortcut_path} ]]; then
+    echo "Renaming ${_shortcut_path}..."
+    mv -f "${_shortcut_path}" "${shortcut_path}"
+else
+    echo "${_shortcut_path} does not exist"
+fi
+
+case $SHELL in
+    (*"zsh") shell_init=$HOME/.zshrc ;;
+    (*"bash") shell_init=$HOME/.bashrc ;;
+esac
+spyder_exe=$(echo ${PREFIX}/envs/*/bin/spyder)
 
-    if [[ -e "$shortcut_path" ]]; then
-        echo "Creating python symbolic link..."
-        ln -sf "${ENV_PREFIX}/bin/python" "$shortcut_path/Contents/MacOS/python"
-    else
-        echo "ERROR: $shortcut_path does not exist"
-        exit 1
-    fi
 
+if [[ ! -e "$spyder_exe" ]]; then
+    echo "$spyder_exe not found. Alias not created."
+elif [[ -z "$shell_init" ]]; then
+    echo "Aliasing for $SHELL not implemented."
 else
-    # Linux
-    name_lower=${INSTALLER_NAME,,}
-    _shortcut_path="$HOME/.local/share/applications/${name_lower}_${name_lower}.desktop"
-    shortcut_path="$(dirname ${_shortcut_path})/${name_lower}.desktop"
-    if [[ -e ${_shortcut_path} ]]; then
-        echo "Renaming ${_shortcut_path}..."
-        mv -f "${_shortcut_path}" "${shortcut_path}"
-    else
-        echo "${_shortcut_path} does not exist"
-    fi
-
-    spyder_exe=$(echo ${PREFIX}/envs/*/bin/spyder)
-    if [[ -e "$spyder_exe" ]]; then
-        case $SHELL in
-            (*"zsh") init_file=$HOME/.zshrc ;;
-            (*"bash") init_file=$HOME/.bashrc ;;
-        esac
-        echo "Aliasing Spyder's executable in $init_file ..."
-        sed -i "/alias spyder=/{h;s|=.*|=${spyder_exe}|};\${x;/^$/{s||\nalias spyder=${spyder_exe}|;H};x}" $init_file
-    else
-        echo "$spyder_exe not found. Alias not created."
-    fi
-
-    echo "Creating uninstall script..."
-    cat <<EOF > ${PREFIX}/uninstall.sh
+    echo "Aliasing Spyder's executable in $shell_init ..."
+    sed -i "/alias spyder=/{h;s|=.*|=${spyder_exe}|};\${x;/^$/{s||\nalias spyder=${spyder_exe}|;H};x}" $shell_init
+fi
+
+echo "Creating uninstall script..."
+cat <<EOF > ${PREFIX}/uninstall.sh
 #!/bin/bash
 rm -rf ${shortcut_path}
 rm -rf ${PREFIX}
 EOF
-    chmod +x ${PREFIX}/uninstall.sh
+chmod +x ${PREFIX}/uninstall.sh
 
-    cat <<EOF
+cat <<EOF
 
 ###############################################################################
 Spyder can be launched by standard methods in Gnome and KDE desktop
@@ -90,6 +62,4 @@ $ ${PREFIX}/uninstall.sh
 
 EOF
 
-fi
-
-echo "*** Post install script for __NAME__ complete"
+echo "*** Post install script for ${INSTALLER_NAME} complete"

installers-conda/resources/spyder-menu.json

@@ -21,8 +21,15 @@
                     ]
                 },
                 "osx": {
-                    "precommand": "eval \"$($SHELL -l -c \"declare -x\")\"\nhere=$(dirname \"$0\")",
-                    "command": ["${here}/python", "${CONDA_PREFIX}/bin/spyder", "$@"],
+                    "precommand": "eval \"$($SHELL -l -c \"declare -x\")\"",
+                    "command": [
+                        "{{ MENU_ITEM_LOCATION }}/Contents/MacOS/python",
+                        "{{ PREFIX }}/bin/spyder",
+                        "$@"
+                    ],
+                    "link_in_bundle": {
+                        "{{ PREFIX }}/bin/python": "{{ MENU_ITEM_LOCATION }}/Contents/MacOS/python"
+                    },
                     "CFBundleName": "Spyder",
                     "CFBundleDisplayName": "Spyder",
                     "CFBundleIdentifier": "org.spyder-ide.Spyder",