From 79323776749c1064eb36e471546f162cc4489abc Mon Sep 17 00:00:00 2001 From: jedeoric Date: Sat, 12 Feb 2022 16:17:10 +0100 Subject: [PATCH 1/2] add conf for loader (atmos/oric-1 Pravetz) --- .github/workflows/main.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8e5027e..974982e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -254,6 +254,7 @@ jobs: mkdir -p orix/usr/share/basic11/$version mkdir -p orix/usr/share/basic10/$version mkdir -p orix/usr/share/pravetzt/$version + mkdir -p orix/etc/systemd/basic/$version/ mkdir -p orix/usr/share/fonts cp rom.110/*.rom orix/usr/share/basic11 cp rom.110/*.rom orix/usr/share/basic11/$version @@ -268,6 +269,17 @@ jobs: echo "Basicusb Hobbit v$version usb;/usr/share/basic/$version/basicus0.rom" >> orix/etc/orixcfg/$version/basic.cnf echo "Basicusb Games v$version joy/usb;/usr/share/basic/$version/basicus1.rom" >> orix/etc/orixcfg/$version/basic.cnf echo "Basicusb v$version joy/usb;/usr/share/basic/$version/basicus2.rom" >> orix/etc/orixcfg/$version/basic.cnf + echo "Generating for loader" + echo "[Atmos (Hobbit v$version/sdcard)]\npath=/usr/share/basic11/$version/basicsd0.rom" > orix/etc/systemd/basic/$version/basic.cnf + echo "[Atmos (Games v$version joy/sdcard)]\npath=/usr/share/basic11/$version/basicsd1.rom" >> orix/etc/systemd/basic/$version/basic.cnf + echo "[Atmos (v$version joy/sdcard)]\npath=/usr/share/basic11/$version/basicsd2.rom" >> orix/etc/systemd/basic/$version/basic.cnf + echo "[Atmos (Hobbit v$version usb)]\npath=/usr/share/basic11/$version/basicus0.rom" >> orix/etc/systemd/basic/$version/basic.cnf + echo "[Atmos (Games v$version joy/usb)]\npath=/usr/share/basic11/$version/basicus1.rom" >> orix/etc/systemd/basic/$version/basic.cnf + echo "[Atmos (v$version joy/usb)]\npath=/usr/share/basic11/$version/basicus2.rom" >> orix/etc/systemd/basic/$version/basic.cnf + echo "[Oric-1 (v$version joy/sdcard)]\npath=/usr/share/basic10/$version/basicsd2.rom" >> orix/etc/systemd/basic/$version/basic.cnf + echo "[Oric-1 (v$version joy/usb)]\npath=/usr/share/basic10/$version/basicus2.rom" >> orix/etc/systemd/basic/$version/basic.cnf + echo "[Pravetz (v$version joy/sdcard)]\npath=/usr/share/pravetzt/$version/pravsd2.rom" >> orix/etc/systemd/basic/$version/basic.cnf + echo "[Pravetz (v$version joy/usb)]\npath=/usr/share/pravetzt/$version/pravus2.rom" >> orix/etc/systemd/basic/$version/basic.cnf cd orix && tar -zcvf $GITHUB_WORKSPACE/$ARCHIVE_NAME * - name: Upload to oric From fc37a7d8357eca99b2c87966729ce7a470d186ac Mon Sep 17 00:00:00 2001 From: jedeoric Date: Sat, 12 Feb 2022 16:24:23 +0100 Subject: [PATCH 2/2] Fix return line --- .github/workflows/main.yml | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 974982e..0e2c94d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -270,16 +270,26 @@ jobs: echo "Basicusb Games v$version joy/usb;/usr/share/basic/$version/basicus1.rom" >> orix/etc/orixcfg/$version/basic.cnf echo "Basicusb v$version joy/usb;/usr/share/basic/$version/basicus2.rom" >> orix/etc/orixcfg/$version/basic.cnf echo "Generating for loader" - echo "[Atmos (Hobbit v$version/sdcard)]\npath=/usr/share/basic11/$version/basicsd0.rom" > orix/etc/systemd/basic/$version/basic.cnf - echo "[Atmos (Games v$version joy/sdcard)]\npath=/usr/share/basic11/$version/basicsd1.rom" >> orix/etc/systemd/basic/$version/basic.cnf - echo "[Atmos (v$version joy/sdcard)]\npath=/usr/share/basic11/$version/basicsd2.rom" >> orix/etc/systemd/basic/$version/basic.cnf - echo "[Atmos (Hobbit v$version usb)]\npath=/usr/share/basic11/$version/basicus0.rom" >> orix/etc/systemd/basic/$version/basic.cnf - echo "[Atmos (Games v$version joy/usb)]\npath=/usr/share/basic11/$version/basicus1.rom" >> orix/etc/systemd/basic/$version/basic.cnf - echo "[Atmos (v$version joy/usb)]\npath=/usr/share/basic11/$version/basicus2.rom" >> orix/etc/systemd/basic/$version/basic.cnf - echo "[Oric-1 (v$version joy/sdcard)]\npath=/usr/share/basic10/$version/basicsd2.rom" >> orix/etc/systemd/basic/$version/basic.cnf - echo "[Oric-1 (v$version joy/usb)]\npath=/usr/share/basic10/$version/basicus2.rom" >> orix/etc/systemd/basic/$version/basic.cnf - echo "[Pravetz (v$version joy/sdcard)]\npath=/usr/share/pravetzt/$version/pravsd2.rom" >> orix/etc/systemd/basic/$version/basic.cnf - echo "[Pravetz (v$version joy/usb)]\npath=/usr/share/pravetzt/$version/pravus2.rom" >> orix/etc/systemd/basic/$version/basic.cnf + echo "[Atmos (Hobbit v$version/sdcard)]" > orix/etc/systemd/basic/$version/basic.cnf + echo "path=/usr/share/basic11/$version/basicsd0.rom" >> orix/etc/systemd/basic/$version/basic.cnf + echo "[Atmos (Games v$version joy/sdcard)]" >> orix/etc/systemd/basic/$version/basic.cnf + echo "path=/usr/share/basic11/$version/basicsd1.rom" >> orix/etc/systemd/basic/$version/basic.cnf + echo "[Atmos (v$version joy/sdcard)]" >> orix/etc/systemd/basic/$version/basic.cnf + echo "path=/usr/share/basic11/$version/basicsd2.rom" >> orix/etc/systemd/basic/$version/basic.cnf + echo "[Atmos (Hobbit v$version usb)]" >> orix/etc/systemd/basic/$version/basic.cnf + echo "path=/usr/share/basic11/$version/basicus0.rom" >> orix/etc/systemd/basic/$version/basic.cnf + echo "[Atmos (Games v$version joy/usb)]" >> orix/etc/systemd/basic/$version/basic.cnf + echo "path=/usr/share/basic11/$version/basicus1.rom" >> orix/etc/systemd/basic/$version/basic.cnf + echo "[Atmos (v$version joy/usb)]" >> orix/etc/systemd/basic/$version/basic.cnf + echo "path=/usr/share/basic11/$version/basicus2.rom" >> orix/etc/systemd/basic/$version/basic.cnf + echo "[Oric-1 (v$version joy/sdcard)]" >> orix/etc/systemd/basic/$version/basic.cnf + echo "path=/usr/share/basic10/$version/basicsd2.rom" >> orix/etc/systemd/basic/$version/basic.cnf + echo "[Oric-1 (v$version joy/usb)]" >> orix/etc/systemd/basic/$version/basic.cnf + echo "path=/usr/share/basic10/$version/basicus2.rom" >> orix/etc/systemd/basic/$version/basic.cnf + echo "[Pravetz (v$version joy/sdcard)]" >> orix/etc/systemd/basic/$version/basic.cnf + echo "path=/usr/share/pravetzt/$version/pravsd2.rom" >> orix/etc/systemd/basic/$version/basic.cnf + echo "[Pravetz (v$version joy/usb)]" >> orix/etc/systemd/basic/$version/basic.cnf + echo "path=/usr/share/pravetzt/$version/pravus2.rom" >> orix/etc/systemd/basic/$version/basic.cnf cd orix && tar -zcvf $GITHUB_WORKSPACE/$ARCHIVE_NAME * - name: Upload to oric