switch to SYS-CONF folder for mc config storage

israpps · Oct 14, 2024 · 1721207 · 1721207
1 parent 2ee1f75
commit 1721207
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -38,7 +38,7 @@ jobs:
         run: |
           apk add build-base git p7zip
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: |
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
           git fetch --prune --unshallow
@@ -127,7 +127,7 @@ jobs:
       - name: update binaries
         run: |
           cp PS2BBL/PS2/COMPRESSED_PS2BBL.ELF Funtuna-Fork/installer/INSTALLER_CONTENTS/BOOT/BOOT.ELF
-          cp PS2BBL/PS2BBL/CONFIG.INI Funtuna-Fork/installer/INSTALLER_CONTENTS/PS2BBL/CONFIG.INI
+          cp PS2BBL/SYS-CONF/PS2BBL.INI Funtuna-Fork/installer/INSTALLER_CONTENTS/SYS-CONF/PS2BBL.INI
 
       - name: update bundled software
         run: |
@@ -155,13 +155,13 @@ jobs:
           echo "If you bought this software you have been SCAMMED.">>release/CREDITS.TXT
           echo "https://github.com/israpps/PlayStation2-Basic-BootLoader">>release/CREDITS.TXT
           cp -r release/ $TARGET/
-          7z a -t7z PS2BBL_OpenTuna_Installer.7z $TARGET/* 
+          7z a -t7z PS2BBL_OpenTuna_Installer.7z $TARGET/*
 
       - name: Upload artifacts
         if: ${{ success() }}
         uses: actions/upload-artifact@v3
         with:
-          name: PS2BBL
+          name: PS2BBL_OPENTUNA
           path: |
             release/PS2BBL_OpenTuna_Installer.ELF
 

diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,7 @@
 #PS2 executables
 *.elf
 *.kelf
-!release/PS2BBL/*.elf
+!release/SYS-CONF/*.elf
 
 # IOP Executable
 *.irx

diff --git a/include/common.h b/include/common.h
@@ -23,8 +23,8 @@ enum
 } CONFIG_SOURCES_ID;
 
 char *CONFIG_PATHS[SOURCE_COUNT] = {
-    "mc0:/PS2BBL/CONFIG.INI",
-    "mc1:/PS2BBL/CONFIG.INI",
+    "mc0:/SYS-CONF/PS2BBL.INI",
+    "mc1:/SYS-CONF/PS2BBL.INI",
     "mass:/PS2BBL/CONFIG.INI",
 #ifdef MX4SIO
     "massX:/PS2BBL/CONFIG.INI",
@@ -36,7 +36,7 @@ char *CONFIG_PATHS[SOURCE_COUNT] = {
     "xfrom:/PS2BBL/CONFIG.INI",
 #endif
 #ifdef PSX
-    "mc?:/PS2BBL/XCONFIG.INI",
+    "mc?:/SYS-CONF/PSXBBL.INI",
 #endif
     "CONFIG.INI",
     "",

diff --git a/release/PS2BBL/CONFIG.INI → release/SYS-CONF/PS2BBL.INI b/release/PS2BBL/CONFIG.INI → release/SYS-CONF/PS2BBL.INI
diff --git a/release/PS2BBL/PS2BBL.icn → release/SYS-CONF/PS2BBL.icn b/release/PS2BBL/PS2BBL.icn → release/SYS-CONF/PS2BBL.icn
diff --git a/release/PS2BBL/icon.sys → release/SYS-CONF/icon.sys b/release/PS2BBL/icon.sys → release/SYS-CONF/icon.sys