From 5c304346ce96ad9b61827e47b7f8e108349b3e10 Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Mon, 20 Mar 2023 21:37:00 -0700
Subject: [PATCH] Removed install vita packages as it's not really necessary
 right now.

---
 .github/workflows/build-helloworld-vita.yml |  6 +-----
 ci/install-vita-packages.sh                 | 23 ---------------------
 ci/install-vita-toolchain.sh                | 23 +++++++++++++++++++--
 3 files changed, 22 insertions(+), 30 deletions(-)
 delete mode 100755 ci/install-vita-packages.sh

diff --git a/.github/workflows/build-helloworld-vita.yml b/.github/workflows/build-helloworld-vita.yml
index afafba42..841ee57d 100644
--- a/.github/workflows/build-helloworld-vita.yml
+++ b/.github/workflows/build-helloworld-vita.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       VITASDK: /usr/local/vitasdk
-      
+
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -15,9 +15,6 @@ jobs:
       - name: Install Vita Toolchain
         run: ./ci/install-vita-toolchain.sh
 
-      - name: Install Vita Packages
-        run: ./ci/install-vita-packages.sh
-
       - name: Install Libraries
         run: ./ci/install-libraries.sh
 
@@ -26,7 +23,6 @@ jobs:
 
       - name: Build Game
         run: |
-          export VITASDK=/usr/local/vitasdk
           export PATH=$VITASDK/bin:$PATH
           mkdir build
           cd build
diff --git a/ci/install-vita-packages.sh b/ci/install-vita-packages.sh
deleted file mode 100755
index 67f44e90..00000000
--- a/ci/install-vita-packages.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-export VITASDK=/usr/local/vitasdk
-export PATH=$VITASDK/bin:$PATH
-sudo apt-get install libarchive-tools
-git clone https://github.com/vitasdk/packages.git ~/vitapackages
-cd ~/vitapackages
-
-dir_array=(
-  "glm"
-  "vitaShaRK"
-  "libmathneon"
-  "kubridge"
-  "SceShaccCgExt"
-  "vitaGL"
-)
-
-curdir=$(pwd)
-for d in "${dir_array[@]}";do
-  echo "${curdir}${d}"
-  cd "${curdir}/${d}"
-  vita-makepkg -C -f -d
-  tar -C $VITASDK/arm-vita-eabi/ -xvf *-arm.tar.xz
-done
\ No newline at end of file
diff --git a/ci/install-vita-toolchain.sh b/ci/install-vita-toolchain.sh
index f114f945..5e2f540a 100755
--- a/ci/install-vita-toolchain.sh
+++ b/ci/install-vita-toolchain.sh
@@ -1,7 +1,26 @@
 #!/bin/bash
-sudo apt-get install cmake
+sudo apt-get install cmake libarchive-tools
 git clone https://github.com/vitasdk/vdpm ~/vdpm
 cd ~/vdpm
 ./bootstrap-vitasdk.sh
 export PATH=$VITASDK/bin:$PATH
-./install-all.sh
\ No newline at end of file
+
+git clone https://github.com/vitasdk/packages.git ~/vitapackages
+cd ~/vitapackages
+
+dir_array=(
+  "glm"
+  "vitaShaRK"
+  "libmathneon"
+  "kubridge"
+  "SceShaccCgExt"
+  "vitaGL"
+)
+
+curdir=$(pwd)
+for d in "${dir_array[@]}";do
+  echo "${curdir}${d}"
+  cd "${curdir}/${d}"
+  vita-makepkg -C -f -d
+  tar -C $VITASDK/arm-vita-eabi/ -xvf *-arm.tar.xz
+done
\ No newline at end of file