Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure the startup script shows a notification on Oolite failure. #432

Merged
merged 1 commit into from
Jul 12, 2023
Merged

Ensure the startup script shows a notification on Oolite failure. #432

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 27 additions & 3 deletions installers/posix/setup.body
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# the "which <filename>" command uses stderr to report a file not found or other warnings
# 2018-07-02: Add command line arguments support.
# First argument added is "--systemwide-path Directory"
# 2023-07-10: Add interactive parts from oolite.src to startup script based on FreeDesktop tools
#


Expand Down Expand Up @@ -211,9 +212,32 @@ mv ${INSTALLER_REPOS}/release.txt .

# Generate startup scripts
cd ${STARTUP_SCRIPTS_PATH}
echo "#!/bin/sh" > oolite${TRUNK}
echo "${OOLITEAPP_PATH}/oolite-wrapper \$@" >> oolite${TRUNK}
echo "exit \$?" >> oolite${TRUNK}

cat << EOF_STARTUP_SCRIPT > oolite${TRUNK}
#!/bin/sh

# show readme on first launch
if [ ! -f \$HOME/.Oolite/.oolite${TRUNK}-run ]
then
mkdir -p $HOME/.Oolite/
touch \$HOME/.Oolite/.oolite${TRUNK}-run
xdg-open file://${OOLITE_ROOT}/doc/README-PREAMBLE.TXT
xdg-open file://${OOLITE_ROOT}/doc/README.TXT
fi

# launch oolite
${OOLITEAPP_PATH}/oolite-wrapper $@
RC=\$?

# show message in case of error
if [ "\${RC}" != "0" ]
then
notify-send --urgency=critical --icon ${OOLITE_ROOT}/oolite.app/Resources/Textures/oolite-logo1.png "Oolite" "Oolite died in a singularity with exit code \${RC}. For troubleshooting check console and log output."
fi

exit \${RC}
EOF_STARTUP_SCRIPT

chmod +x oolite${TRUNK}
echo "#!/bin/sh" > oolite${TRUNK}-update
echo "${OOLITEAPP_PATH}/oolite-update \$@" >> oolite${TRUNK}-update
Expand Down