From dcfe9f7affb6079586678d37ea1e8233bdd15923 Mon Sep 17 00:00:00 2001
From: lubuntu <qurious@gmx.com>
Date: Tue, 13 Jul 2021 12:56:33 -0700
Subject: [PATCH] Build: Remove plugin references

---
 .github/workflows/linux-workflow.yml        |  6 +++---
 .github/workflows/scripts/linux/AppRun      |  4 ++--
 .github/workflows/scripts/linux/appimage.sh | 14 ++++++--------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/linux-workflow.yml b/.github/workflows/linux-workflow.yml
index b1f05f37bd..6c85d042fc 100644
--- a/.github/workflows/linux-workflow.yml
+++ b/.github/workflows/linux-workflow.yml
@@ -47,19 +47,19 @@ jobs:
             # Need to disable PCH until cmake 3.17
             # (PCH conflicts with ccache, fixed by https://gitlab.kitware.com/cmake/cmake/-/merge_requests/4400)
             cmakeflags: -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON
-            detail: nopch
+            detail: -nopch
             experimental: false
           - os: ubuntu-18.04
             platform: x86
             compiler: gcc
             cmakeflags: -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON
-            detail: nopch
+            detail: -nopch
             experimental: false
           - os: ubuntu-18.04
             platform: x86
             compiler: gcc
             cmakeflags: -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON -DARCH_FLAG=-march=haswell
-            detail: avx2 nopch
+            detail: -avx2-nopch
             experimental: false
 
     name: "${{ matrix.platform }} | ${{ matrix.compiler }} ${{ matrix.detail }}"
diff --git a/.github/workflows/scripts/linux/AppRun b/.github/workflows/scripts/linux/AppRun
index e7f1d2d010..a50e1d284c 100755
--- a/.github/workflows/scripts/linux/AppRun
+++ b/.github/workflows/scripts/linux/AppRun
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-export LD_LIBRARY_PATH="/tmp/PCSX2:$APPDIR/usr/lib:$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH="$APPDIR/usr/lib:$LD_LIBRARY_PATH"
 BINARY_NAME=$(basename "$ARGV0")
 if [[ ! -e "$PWD/$BINARY_NAME.config" ]]; then
         mkdir "$PWD/$BINARY_NAME.config"
 fi       
 export XDG_CONFIG_HOME="$PWD/$BINARY_NAME.config"
 
-ln -sf $APPDIR/usr/bin/plugins /tmp/PCSX2 
+ln -sf $APPDIR/usr/bin/app /tmp/PCSX2 
 mkdir -p $HOME/.local/share/icons/hicolor/scalable/apps && cp $APPDIR/PCSX2.png $HOME/.local/share/icons/hicolor/scalable/apps
 
 $APPDIR/AppRun-patched
diff --git a/.github/workflows/scripts/linux/appimage.sh b/.github/workflows/scripts/linux/appimage.sh
index 429b6fbb07..dded1f74d3 100755
--- a/.github/workflows/scripts/linux/appimage.sh
+++ b/.github/workflows/scripts/linux/appimage.sh
@@ -39,20 +39,18 @@ chmod a+x ./squashfs-root/AppRun
 chmod a+x ./squashfs-root/runtime
 chmod a+x ./squashfs-root/AppRun-patched
 echo "$name" > "$GITHUB_WORKSPACE"/squashfs-root/version.txt
-mkdir -p "$GITHUB_WORKSPACE"/squashfs-root/usr/bin/{plugins,vm}
+mkdir -p "$GITHUB_WORKSPACE"/squashfs-root/usr/bin/app
 cp -r "$GITHUB_WORKSPACE"/bin/Langs "$GITHUB_WORKSPACE"/squashfs-root/usr/bin/
-cp "$GITHUB_WORKSPACE"/bin/docs/{Configuration_Guide.pdf,PCSX2_FAQ.pdf} "$GITHUB_WORKSPACE"/squashfs-root/usr/bin/plugins
-cp "$GITHUB_WORKSPACE"/bin/cheats_ws.zip "$GITHUB_WORKSPACE"/squashfs-root/usr/bin/plugins
-if [[ -e "$BUILDPATH/plugins" ]]; then
-  find "$BUILDPATH/plugins" -iname '*.so' -exec cp {} "$GITHUB_WORKSPACE"/squashfs-root/usr/bin/plugins \;
-fi
-cp ./bin/GameIndex.yaml "$GITHUB_WORKSPACE"/squashfs-root/usr/bin/plugins/GameIndex.yaml
+cp "$GITHUB_WORKSPACE"/bin/docs/{Configuration_Guide.pdf,PCSX2_FAQ.pdf} "$GITHUB_WORKSPACE"/squashfs-root/usr/bin/app
+cp "$GITHUB_WORKSPACE"/bin/cheats_ws.zip "$GITHUB_WORKSPACE"/squashfs-root/usr/bin/app
+
+cp ./bin/GameIndex.yaml "$GITHUB_WORKSPACE"/squashfs-root/usr/bin/app/GameIndex.yaml
 export UPD_INFO="gh-releases-zsync|PCSX2|pcsx2|latest|$name.AppImage.zsync"
 export OUTPUT="$name.AppImage"
 /tmp/squashfs-root/AppRun --appdir="$GITHUB_WORKSPACE"/squashfs-root/ -d "$GITHUB_WORKSPACE"/squashfs-root/PCSX2.desktop -i "$GITHUB_WORKSPACE"/squashfs-root/PCSX2.png --output appimage
 mkdir -p "$GITHUB_WORKSPACE"/artifacts/
 ls -al .
-mv "$name.AppImage" "$GITHUB_WORKSPACE"/artifacts # && mv "$name.AppImage.zsync" $GITHUB_WORKSPACE/artifacts
+mv "$name.AppImage" "$GITHUB_WORKSPACE"/artifacts # && mv "$name.AppImage.zsync" "$GITHUB_WORKSPACE"/artifacts
 chmod -R 777 ./artifacts
 cd ./artifacts
 ls -al .