From 97b7923a397637c93d93f6c35b446a3470ac8463 Mon Sep 17 00:00:00 2001 From: Skitals Date: Tue, 12 Apr 2022 08:56:43 -0400 Subject: [PATCH 1/5] Replace wget with curl for Steam Deck support wget is not included in SteamOS and not easy to install because the file system is read-only by default and any changes will get wiped by the next system update. This is the only instance where wget is used, curl is used extensively in appimage.sh. --- .github/workflows/AppRun | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/AppRun b/.github/workflows/AppRun index ef2fc85c7..3ba9e5de0 100644 --- a/.github/workflows/AppRun +++ b/.github/workflows/AppRun @@ -5,7 +5,7 @@ export GDK_PIXBUF_MODULE_FILE=$(pkg-config --variable=gdk_pixbuf_cache_file gdk- mkdir -p $HOME/.local/share/icons/hicolor/scalable/apps && cp $APPDIR/yuzu.svg $HOME/.local/share/icons/hicolor/scalable/apps -GITVER=`wget -qO- https://api.github.com/repos/pineappleEA/pineapple-src/releases/latest | grep "EA-" | grep -o 'EA-[[:digit:]]*'` +GITVER=`curl -sL https://api.github.com/repos/pineappleEA/pineapple-src/releases/latest | grep "EA-" | grep -o 'EA-[[:digit:]]*'` APPVER=`cat $APPDIR/version.txt` if [[ -z "$GITVER" ]]; then From 7e61fe3a0651035c4dec0baee278d7864c271e8e Mon Sep 17 00:00:00 2001 From: Skitals Date: Fri, 15 Apr 2022 18:38:44 -0400 Subject: [PATCH 2/5] Update AppRun --- .github/workflows/AppRun | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/AppRun b/.github/workflows/AppRun index 3ba9e5de0..29f47d7e3 100644 --- a/.github/workflows/AppRun +++ b/.github/workflows/AppRun @@ -5,7 +5,7 @@ export GDK_PIXBUF_MODULE_FILE=$(pkg-config --variable=gdk_pixbuf_cache_file gdk- mkdir -p $HOME/.local/share/icons/hicolor/scalable/apps && cp $APPDIR/yuzu.svg $HOME/.local/share/icons/hicolor/scalable/apps -GITVER=`curl -sL https://api.github.com/repos/pineappleEA/pineapple-src/releases/latest | grep "EA-" | grep -o 'EA-[[:digit:]]*'` +GITVER=`( wget -qO- https://api.github.com/repos/pineappleEA/pineapple-src/releases/latest || curl -sL https://api.github.com/repos/pineappleEA/pineapple-src/releases/latest ) | grep "EA-" | grep -o 'EA-[[:digit:]]*'` APPVER=`cat $APPDIR/version.txt` if [[ -z "$GITVER" ]]; then From c6d29eea6cab5ea519fe300fe812675a948c85aa Mon Sep 17 00:00:00 2001 From: Skitals Date: Fri, 15 Apr 2022 18:51:24 -0400 Subject: [PATCH 3/5] if no wget fail silently before trying curl --- .github/workflows/AppRun | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/AppRun b/.github/workflows/AppRun index 29f47d7e3..cb0292500 100644 --- a/.github/workflows/AppRun +++ b/.github/workflows/AppRun @@ -5,7 +5,7 @@ export GDK_PIXBUF_MODULE_FILE=$(pkg-config --variable=gdk_pixbuf_cache_file gdk- mkdir -p $HOME/.local/share/icons/hicolor/scalable/apps && cp $APPDIR/yuzu.svg $HOME/.local/share/icons/hicolor/scalable/apps -GITVER=`( wget -qO- https://api.github.com/repos/pineappleEA/pineapple-src/releases/latest || curl -sL https://api.github.com/repos/pineappleEA/pineapple-src/releases/latest ) | grep "EA-" | grep -o 'EA-[[:digit:]]*'` +GITVER=`( wget -qO- https://api.github.com/repos/pineappleEA/pineapple-src/releases/latest 2>/dev/null || curl -sL https://api.github.com/repos/pineappleEA/pineapple-src/releases/latest ) | grep "EA-" | grep -o 'EA-[[:digit:]]*'` APPVER=`cat $APPDIR/version.txt` if [[ -z "$GITVER" ]]; then From 7871e20748654ebcb0ef8c8f5b0a674582071d9c Mon Sep 17 00:00:00 2001 From: Skitals Date: Fri, 15 Apr 2022 18:59:36 -0400 Subject: [PATCH 4/5] move url to variable --- .github/workflows/AppRun | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/AppRun b/.github/workflows/AppRun index cb0292500..cff036fc7 100644 --- a/.github/workflows/AppRun +++ b/.github/workflows/AppRun @@ -5,7 +5,8 @@ export GDK_PIXBUF_MODULE_FILE=$(pkg-config --variable=gdk_pixbuf_cache_file gdk- mkdir -p $HOME/.local/share/icons/hicolor/scalable/apps && cp $APPDIR/yuzu.svg $HOME/.local/share/icons/hicolor/scalable/apps -GITVER=`( wget -qO- https://api.github.com/repos/pineappleEA/pineapple-src/releases/latest 2>/dev/null || curl -sL https://api.github.com/repos/pineappleEA/pineapple-src/releases/latest ) | grep "EA-" | grep -o 'EA-[[:digit:]]*'` +GITURL=`https://api.github.com/repos/pineappleEA/pineapple-src/releases/latest` +GITVER=`( wget -qO- $GITURL 2>/dev/null || curl -sL $GITURL ) | grep "EA-" | grep -o 'EA-[[:digit:]]*'` APPVER=`cat $APPDIR/version.txt` if [[ -z "$GITVER" ]]; then From 7644ebef942bc8ca76dbc4585295dcf8cb2f7272 Mon Sep 17 00:00:00 2001 From: Skitals Date: Sat, 16 Apr 2022 09:49:06 -0400 Subject: [PATCH 5/5] fix backtick --- .github/workflows/AppRun | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/AppRun b/.github/workflows/AppRun index cff036fc7..718498f1e 100644 --- a/.github/workflows/AppRun +++ b/.github/workflows/AppRun @@ -5,7 +5,7 @@ export GDK_PIXBUF_MODULE_FILE=$(pkg-config --variable=gdk_pixbuf_cache_file gdk- mkdir -p $HOME/.local/share/icons/hicolor/scalable/apps && cp $APPDIR/yuzu.svg $HOME/.local/share/icons/hicolor/scalable/apps -GITURL=`https://api.github.com/repos/pineappleEA/pineapple-src/releases/latest` +GITURL='https://api.github.com/repos/pineappleEA/pineapple-src/releases/latest' GITVER=`( wget -qO- $GITURL 2>/dev/null || curl -sL $GITURL ) | grep "EA-" | grep -o 'EA-[[:digit:]]*'` APPVER=`cat $APPDIR/version.txt`