From 5e150635d4c251675b5846b8571532edd1e5d03f Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Wed, 22 Jun 2022 06:23:59 -0700 Subject: [PATCH 1/3] Fixes finding the path of Pineapple. --- .github/workflows/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update.sh b/.github/workflows/update.sh index a80bf9fdc..051cedce4 100644 --- a/.github/workflows/update.sh +++ b/.github/workflows/update.sh @@ -4,7 +4,7 @@ zenity --question --timeout=10 --title="yuzu updater" --text="New update availab answer=$? if [ "$answer" -eq 0 ]; then - $APPDIR/usr/bin/AppImageUpdate $PWD/yuzu-x86_64.AppImage && $PWD/yuzu-x86_64.AppImage "$@" + $APPDIR/usr/bin/AppImageUpdate $APPIMAGE && ${APPIMAGE%$ARGV0}yuzu-x86_64.AppImage "$@" elif [ "$answer" -eq 1 ]; then $APPDIR/AppRun-patched "$@" elif [ "$answer" -eq 5 ]; then From dca272cb36515c547228014c28c52fba59c2af16 Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Wed, 22 Jun 2022 06:50:49 -0700 Subject: [PATCH 2/3] Check directory is writeable Check if current directory is writeable. If not, skip updating. --- .github/workflows/update.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update.sh b/.github/workflows/update.sh index 051cedce4..f4ff8e837 100644 --- a/.github/workflows/update.sh +++ b/.github/workflows/update.sh @@ -3,8 +3,15 @@ zenity --question --timeout=10 --title="yuzu updater" --text="New update available. Update now?" --icon-name=yuzu --window-icon=yuzu.svg --height=80 --width=400 answer=$? +directory=${APPIMAGE%$ARGV0} + if [ "$answer" -eq 0 ]; then - $APPDIR/usr/bin/AppImageUpdate $APPIMAGE && ${APPIMAGE%$ARGV0}yuzu-x86_64.AppImage "$@" + if [ -w $directory ] ; then + $APPDIR/usr/bin/AppImageUpdate $APPIMAGE && "$directory"yuzu-x86_64.AppImage "$@" + else + echo -e "Cannot update in $directory\n\n" + $APPDIR/AppRun-patched "$@" + fi elif [ "$answer" -eq 1 ]; then $APPDIR/AppRun-patched "$@" elif [ "$answer" -eq 5 ]; then From 7b3899da80bac376af193d272bc7858e72128b4a Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Wed, 22 Jun 2022 07:18:11 -0700 Subject: [PATCH 3/3] Use Zenity to display error message Zenity will display error Timeout after 5 seconds Start yuzu --- .github/workflows/update.sh | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/update.sh b/.github/workflows/update.sh index f4ff8e837..dcfc6fda0 100644 --- a/.github/workflows/update.sh +++ b/.github/workflows/update.sh @@ -1,20 +1,23 @@ #!/bin/bash -zenity --question --timeout=10 --title="yuzu updater" --text="New update available. Update now?" --icon-name=yuzu --window-icon=yuzu.svg --height=80 --width=400 -answer=$? - directory=${APPIMAGE%$ARGV0} -if [ "$answer" -eq 0 ]; then - if [ -w $directory ] ; then - $APPDIR/usr/bin/AppImageUpdate $APPIMAGE && "$directory"yuzu-x86_64.AppImage "$@" - else - echo -e "Cannot update in $directory\n\n" +if [ -w $directory ] ; then + zenity --question --timeout=10 --title="yuzu updater" --text="New update available. Update now?" --icon-name=yuzu --window-icon=yuzu.svg --height=80 --width=400 + answer=$? + + if [ "$answer" -eq 0 ]; then + + $APPDIR/usr/bin/AppImageUpdate $APPIMAGE && "$directory"yuzu-x86_64.AppImage "$@" + + elif [ "$answer" -eq 1 ]; then + $APPDIR/AppRun-patched "$@" + elif [ "$answer" -eq 5 ]; then $APPDIR/AppRun-patched "$@" fi -elif [ "$answer" -eq 1 ]; then - $APPDIR/AppRun-patched "$@" -elif [ "$answer" -eq 5 ]; then + +else + zenity --error --timeout=5 --text="Cannot update in $directory" --title="Update Error" --width=500 --width=200 $APPDIR/AppRun-patched "$@" fi exit 0