From 82aad455c2a2d76d044d743a22daac7bfa056087 Mon Sep 17 00:00:00 2001 From: Noah Emke Date: Sun, 19 Feb 2023 01:06:58 -0500 Subject: [PATCH 1/7] Delete to_linux.ps1 This seems like a user specific dev script that should likely be kept out of the repo --- onboard/to_linux.ps1 | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 onboard/to_linux.ps1 diff --git a/onboard/to_linux.ps1 b/onboard/to_linux.ps1 deleted file mode 100644 index 6d5259c..0000000 --- a/onboard/to_linux.ps1 +++ /dev/null @@ -1,3 +0,0 @@ -dotnet publish -c Release -r linux-x64 --no-self-contained -rm -r -force C:\Users\dingus\Documents\devcade-shared\publish\ -cp C:\Users\dingus\Code\Devcade-onboard\onboard\bin\Release\netcoreapp3.1\linux-x64\publish\ C:\Users\dingus\Documents\devcade-shared\ -r \ No newline at end of file From eb7e678ca985b36b543b3fc14daeaa7485af6ea0 Mon Sep 17 00:00:00 2001 From: Noah Emke Date: Sun, 19 Feb 2023 01:11:07 -0500 Subject: [PATCH 2/7] Delete release.sh Obsolete. Instead use Devcade-onboard/idiot/update_onboard.sh on the cabinet itself to pull changes --- onboard/release.sh | 4 ---- 1 file changed, 4 deletions(-) delete mode 100755 onboard/release.sh diff --git a/onboard/release.sh b/onboard/release.sh deleted file mode 100755 index 9edad1f..0000000 --- a/onboard/release.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -dotnet publish -c Release -r linux-x64 --no-self-contained && \ -scp -r /Devcade-onboard/onboard/bin/Release/netcoreapp3.1/linux-x64/publish/ devcade@devcade.csh.rit.edu:~/onboard-new - From e378733174086d5e9e0abbbfac8686574fd3a39a Mon Sep 17 00:00:00 2001 From: Noah Emke Date: Sun, 19 Feb 2023 01:17:41 -0500 Subject: [PATCH 3/7] Update Dockerfile Updated installed packages in the dev dockerfile to reflect the required packages in the new devcade installation guide. --- HACKING/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HACKING/Dockerfile b/HACKING/Dockerfile index 34dfe73..dc4bd5c 100644 --- a/HACKING/Dockerfile +++ b/HACKING/Dockerfile @@ -1,7 +1,7 @@ FROM debian:buster RUN apt-get -y update -RUN apt-get -y install vim wget git fonts-liberation fontconfig-config tmux xterm pulseaudio zip unzip +RUN apt-get -y install vim wget git fonts-liberation fontconfig-config tmux xterm xorg compton openbox pulseaudio zip unzip RUN wget https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb \ -O packages-microsoft-prod.deb && \ dpkg -i packages-microsoft-prod.deb && \ From 0d30b940b2e157f8eaf81fb7d789513d35b6778a Mon Sep 17 00:00:00 2001 From: Noah Emke Date: Sun, 19 Mar 2023 18:01:55 -0400 Subject: [PATCH 4/7] Rename HACKING to dev-environment --- {HACKING => dev-environment}/Dockerfile | 0 {HACKING => dev-environment}/build-environment.sh | 0 {HACKING => dev-environment}/launch-environment.sh | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {HACKING => dev-environment}/Dockerfile (100%) rename {HACKING => dev-environment}/build-environment.sh (100%) mode change 100755 => 100644 rename {HACKING => dev-environment}/launch-environment.sh (100%) mode change 100755 => 100644 diff --git a/HACKING/Dockerfile b/dev-environment/Dockerfile similarity index 100% rename from HACKING/Dockerfile rename to dev-environment/Dockerfile diff --git a/HACKING/build-environment.sh b/dev-environment/build-environment.sh old mode 100755 new mode 100644 similarity index 100% rename from HACKING/build-environment.sh rename to dev-environment/build-environment.sh diff --git a/HACKING/launch-environment.sh b/dev-environment/launch-environment.sh old mode 100755 new mode 100644 similarity index 100% rename from HACKING/launch-environment.sh rename to dev-environment/launch-environment.sh From 95ce24fc426deaad4ddb461d0fed9ffa4ed94969 Mon Sep 17 00:00:00 2001 From: Noah Emke Date: Sun, 19 Mar 2023 18:06:33 -0400 Subject: [PATCH 5/7] Update readdme to reflect rename of hacking --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 92b277b..1f13191 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ sudo systemctl enable --now xlogin@devcade _Helpful Tip: Remember to `chmod +x onboard`. You may get weird syntax errors if you don't_ -## HACKING +## Setting up a dev environment To setup and launch a development environment, you can do the following: @@ -65,7 +65,7 @@ DEVCADE_API_DOMAIN ### Building and Launching the Container ``` -cd HACKING +cd dev-environment ./build-environment.sh ./launch-environment.sh ``` From 6175a71444c2541b771d494ba9830d173913e563 Mon Sep 17 00:00:00 2001 From: Noah Emke Date: Fri, 7 Apr 2023 01:19:16 -0400 Subject: [PATCH 6/7] rename idiot to install --- .gitmodules | 2 +- README.md | 26 ++++++++++++++------------ idiot/xlogin | 1 - {idiot => install}/.env | 0 {idiot => install}/.xinitrc | 0 {idiot => install}/rc.xml | 0 {idiot => install}/update_onboard.sh | 0 7 files changed, 15 insertions(+), 14 deletions(-) delete mode 160000 idiot/xlogin rename {idiot => install}/.env (100%) rename {idiot => install}/.xinitrc (100%) rename {idiot => install}/rc.xml (100%) rename {idiot => install}/update_onboard.sh (100%) mode change 100755 => 100644 diff --git a/.gitmodules b/.gitmodules index 7f814fd..e214d78 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "idiot/xlogin"] - path = idiot/xlogin + path = install/xlogin url = https://github.com/joukewitteveen/xlogin diff --git a/README.md b/README.md index 1f13191..2b5f44d 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,20 @@ # Devcade-onboard The onboard menu and control software for the Devcade custom arcade system. -## Building +## Building on a devcade system -Run the `update_onboard.sh` script located in HACKING +Run the `update_onboard.sh` script located in install ## Building (manual) -To build and run on the Idiot, do the following from `/onboard`: +To build and run on the DCU, do the following from `/onboard`: ``` dotnet publish -c Release -r linux-x64 --no-self-contained ``` -To put it on the Idiot, compress the `publish` folder located at `\Devcade-onboard\onboard\bin\Release\netcoreapp3.1\linux-x64` and `scp` that to the Idiot. +To put it on the DCU (devcade compute unit), compress the `publish` folder located at `\Devcade-onboard\onboard\bin\Release\netcoreapp3.1\linux-x64` and `scp` that to the DCU. -## The Idiot +## The Devcade Compute Unit (DCU) ### Prereqs @@ -22,26 +22,28 @@ Debian >=10 A user named `devcade` -`apt install xterm openbox compton` and friends (I dont actually know what all is installed) +`apt install xinit xterm git build-essential wget openbox compton pulseaudio x11-xserver-utils` + +Also install dotnet-sdk-6.0 which requires adding microsofts package repo. ### Daemon _daemons are always watching. They are always with you. So is Willard._ -The Devcade Idiot is running Debian 10 with a very _very_ simple Xorg server setup. It has [xlogin](https://github.com/joukewitteveen/xlogin) configured to launch the onboarding program, along with said xorg server, as the `devcade` user. +The DCU is running Debian 10 with a very _very_ simple Xorg server setup. It has [xlogin](https://github.com/joukewitteveen/xlogin) configured to launch the onboarding program, along with said xorg server, as the `devcade` user. -You can find everything(tm) you need to set up the Devcade Idiot in `/idiot`. This repo has a submodule, `xlogin` that can be cloned down with `git submodule update --init --recursive`. +You can find everything(tm) you need to set up the DCU in `/install`. This repo has a submodule, `xlogin` that can be cloned down with `git submodule update --init --recursive`. -1. Run the `update_onboard.sh` script in `HACKING/` +1. Run the `update_onboard.sh` script in `install/` -2. `cp idiot/.xinitrc /home/devcade/` +2. `cp install/.xinitrc /home/devcade/` -2. `mkdir /home/devcade/.config/openbox && cp idiot/rc.xml /home/devcade/.config/openbox/rc.xml` +2. `mkdir /home/devcade/.config/openbox && cp install/rc.xml /home/devcade/.config/openbox/rc.xml` 3. To install `xlogin`, do the following ``` -cd idiot/xlogin +cd install/xlogin sudo make install sudo systemctl enable --now xlogin@devcade ``` diff --git a/idiot/xlogin b/idiot/xlogin deleted file mode 160000 index 6e566b5..0000000 --- a/idiot/xlogin +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6e566b5b399005c4f62e6c275f91a3625baa1bef diff --git a/idiot/.env b/install/.env similarity index 100% rename from idiot/.env rename to install/.env diff --git a/idiot/.xinitrc b/install/.xinitrc similarity index 100% rename from idiot/.xinitrc rename to install/.xinitrc diff --git a/idiot/rc.xml b/install/rc.xml similarity index 100% rename from idiot/rc.xml rename to install/rc.xml diff --git a/idiot/update_onboard.sh b/install/update_onboard.sh old mode 100755 new mode 100644 similarity index 100% rename from idiot/update_onboard.sh rename to install/update_onboard.sh From a12ab0a60055d9a674965d87e10796890770fbb9 Mon Sep 17 00:00:00 2001 From: Noah Emke Date: Fri, 7 Apr 2023 01:20:55 -0400 Subject: [PATCH 7/7] Update .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index e214d78..ff71bc5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "idiot/xlogin"] +[submodule "install/xlogin"] path = install/xlogin url = https://github.com/joukewitteveen/xlogin