diff --git a/build_tools/osx_distribution.xml b/build_tools/osx_distribution.xml index 6b36f31e2..96df99e48 100644 --- a/build_tools/osx_distribution.xml +++ b/build_tools/osx_distribution.xml @@ -1,11 +1,11 @@ fish shell - + - - + + diff --git a/build_tools/osx_package_resources/welcome.html b/build_tools/osx_package_resources/welcome.html new file mode 100644 index 000000000..5bfd6e46d --- /dev/null +++ b/build_tools/osx_package_resources/welcome.html @@ -0,0 +1,29 @@ + + + + + +

+ fish is a smart and user-friendly command line shell. For more information, visit fishshell.com. +

+

+ fish will be installed into /usr/local/, and its path will be added to /etc/shells if necessary. +

+

+ Your default shell will not be changed. To make fish your login shell after the installation, run: +

+

+ chsh -s /usr/local/bin/fish +

+

Enjoy! Bugs can be reported on GitHub.

+ + \ No newline at end of file diff --git a/build_tools/osx_package_resources/welcome.rtf b/build_tools/osx_package_resources/welcome.rtf deleted file mode 100644 index 3be3d8914..000000000 --- a/build_tools/osx_package_resources/welcome.rtf +++ /dev/null @@ -1,26 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1485\cocoasubrtf410 -{\fonttbl\f0\fnil\fcharset0 HelveticaNeue;\f1\fnil\fcharset0 Menlo-Regular;} -{\colortbl;\red255\green255\blue255;} -{\*\expandedcolortbl;\csgenericrgb\c100000\c100000\c100000;} -{\info -{\author dlkfjslfjsfdlkfk}}\margl1440\margr1440\vieww10800\viewh8400\viewkind0 -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 - -\f0\fs30 \cf0 Fish is a smart and user friendly command line shell. For more information, visit {\field{\*\fldinst{HYPERLINK "https://fishshell.com"}}{\fldrslt https://fishshell.com}}\ -\ -fish will be installed into -\f1\fs26 /usr/local/ -\f0\fs30 , and fish will be added to -\f1\fs26 /etc/shells -\f0\fs30 if necessary.\ -\ -Your default shell will -\i not -\i0 be changed. To make fish your default, run:\ -\ - -\f1 chsh -s /usr/local/bin/fish -\f0 \ -\ -Enjoy!\ -} \ No newline at end of file diff --git a/build_tools/osx_package_scripts/postinstall b/build_tools/osx_package_scripts/postinstall index e9a6a0517..58382a7d0 100755 --- a/build_tools/osx_package_scripts/postinstall +++ b/build_tools/osx_package_scripts/postinstall @@ -1,3 +1,3 @@ #!/bin/sh -x -./add-shell ${DSTVOLUME}usr/local/bin/fish | logger -s -t "${INSTALL_PKG_SESSION_ID}" +./add-shell ${DSTVOLUME}usr/local/bin/fish \ No newline at end of file diff --git a/build_tools/osx_package_scripts/preinstall b/build_tools/osx_package_scripts/preinstall index 2f2cffb3b..fcb5e8411 100755 --- a/build_tools/osx_package_scripts/preinstall +++ b/build_tools/osx_package_scripts/preinstall @@ -1,7 +1,7 @@ #!/bin/sh -x -logger -s -t "${INSTALL_PKG_SESSION_ID}" "Removing any previous installation" +echo "Removing any previous installation" pkgutil --pkg-info ${INSTALL_PKG_SESSION_ID} && pkgutil pkgutil --only-files --files ${INSTALL_PKG_SESSION_ID} | while read installed do rm -v ${DSTVOLUME}${installed} -done | logger -s -t "${INSTALL_PKG_SESSION_ID}" -logger -s -t "${INSTALL_PKG_SESSION_ID}" "... removed" +done +echo "... removed"