From ea4307a282468c20c27c6b8c2722bd46f6d5c64d Mon Sep 17 00:00:00 2001 From: Ishan Jalan <44338423+ishanjalan@users.noreply.github.com> Date: Wed, 20 Jul 2022 22:30:09 +0530 Subject: [PATCH 1/2] Update unix-launcher.sh This will open the default shell. Works for me after testing. --- src/SMAPI.Installer/assets/unix-launcher.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SMAPI.Installer/assets/unix-launcher.sh b/src/SMAPI.Installer/assets/unix-launcher.sh index ae9624e7..cff21bb0 100644 --- a/src/SMAPI.Installer/assets/unix-launcher.sh +++ b/src/SMAPI.Installer/assets/unix-launcher.sh @@ -58,7 +58,7 @@ if [ "$(uname)" == "Darwin" ]; then echo "\"$0\" $@ --use-current-shell" >> /tmp/open-smapi-terminal.sh chmod +x /tmp/open-smapi-terminal.sh cat /tmp/open-smapi-terminal.sh - open -W -a Terminal /tmp/open-smapi-terminal.sh + open -W /tmp/open-smapi-terminal.sh rm /tmp/open-smapi-terminal.sh exit 0 fi From a50a730886e2649472011e5c0eca5113b3774555 Mon Sep 17 00:00:00 2001 From: Ishan Jalan <44338423+ishanjalan@users.noreply.github.com> Date: Sun, 24 Jul 2022 12:01:34 +0530 Subject: [PATCH 2/2] unix-launcher.sh optimisations I ran the file through Rider which used Intellisense(?) to suggest changes in addition to moving from .sh to .command --- src/SMAPI.Installer/assets/unix-launcher.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SMAPI.Installer/assets/unix-launcher.sh b/src/SMAPI.Installer/assets/unix-launcher.sh index cff21bb0..b9d468a0 100644 --- a/src/SMAPI.Installer/assets/unix-launcher.sh +++ b/src/SMAPI.Installer/assets/unix-launcher.sh @@ -54,12 +54,12 @@ if [ "$(uname)" == "Darwin" ]; then # https://stackoverflow.com/a/29511052/262123 if [ "$USE_CURRENT_SHELL" == "false" ]; then echo "Reopening in the Terminal app..." - echo '#!/bin/sh' > /tmp/open-smapi-terminal.sh - echo "\"$0\" $@ --use-current-shell" >> /tmp/open-smapi-terminal.sh - chmod +x /tmp/open-smapi-terminal.sh - cat /tmp/open-smapi-terminal.sh - open -W /tmp/open-smapi-terminal.sh - rm /tmp/open-smapi-terminal.sh + echo '#!/bin/sh' > /tmp/open-smapi-terminal.command + echo "\"$0\" $@ --use-current-shell" >> /tmp/open-smapi-terminal.command + chmod +x /tmp/open-smapi-terminal.command + cat /tmp/open-smapi-terminal.command + open -W /tmp/open-smapi-terminal.command + rm /tmp/open-smapi-terminal.command exit 0 fi fi