From aa2884eed048f1f3c68ba54277d267d0970462ad Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Wed, 3 Jan 2024 21:42:53 +0100
Subject: [PATCH] Move most games from /games to /usr/games
---
recipes/demos/sdl2-gears/gears.c | 6 +++---
recipes/demos/sdl2-gears/recipe.sh | 12 ++++++------
recipes/games/classicube/manifest | 2 +-
recipes/games/classicube/recipe.toml | 4 ++--
recipes/games/eduke32/manifest | 2 +-
recipes/games/eduke32/recipe.toml | 6 +++---
recipes/games/freedoom/recipe.toml | 8 ++++----
recipes/games/neverball/manifest-neverball | 2 +-
recipes/games/neverball/manifest-neverputt | 2 +-
recipes/games/neverball/recipe.sh | 6 +++---
recipes/games/vvvvvv/recipe.sh | 4 ++--
11 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/recipes/demos/sdl2-gears/gears.c b/recipes/demos/sdl2-gears/gears.c
index 93faf7e93..887e00854 100644
--- a/recipes/demos/sdl2-gears/gears.c
+++ b/recipes/demos/sdl2-gears/gears.c
@@ -276,13 +276,13 @@ void CheckSDLError(int line)
}
SDL_Surface *image;
-const char *IMAGE_FILE_NAME = "/games/sdl2_gears/assets/image.png";
+const char *IMAGE_FILE_NAME = "/usr/games/sdl2_gears/assets/image.png";
Mix_Music *music = NULL;
-const char *MUSIC_FILE_NAME = "/games/sdl2_gears/assets/music.wav";
+const char *MUSIC_FILE_NAME = "/usr/games/sdl2_gears/assets/music.wav";
TTF_Font *font = NULL;
-const char *TTF_FILE_NAME = "/games/sdl2_gears/assets/font.ttf";
+const char *TTF_FILE_NAME = "/usr/games/sdl2_gears/assets/font.ttf";
void cleanup()
{
diff --git a/recipes/demos/sdl2-gears/recipe.sh b/recipes/demos/sdl2-gears/recipe.sh
index 6da36dd23..949a00727 100644
--- a/recipes/demos/sdl2-gears/recipe.sh
+++ b/recipes/demos/sdl2-gears/recipe.sh
@@ -28,11 +28,11 @@ function recipe_clean {
function recipe_stage {
dest="$(realpath $1)"
- mkdir -pv "$dest/games/sdl2_gears"
- mkdir -pv "$dest/games/sdl2_gears/assets"
- cp -v "sdl2_gears" "$dest/games/sdl2_gears/sdl2_gears"
- cp -v "assets/image.png" "$dest/games/sdl2_gears/assets/image.png"
- cp -v "assets/music.wav" "$dest/games/sdl2_gears/assets/music.wav"
- cp -v "assets/font.ttf" "$dest/games/sdl2_gears/assets/font.ttf"
+ mkdir -pv "$dest/usr/games/sdl2_gears"
+ mkdir -pv "$dest/usr/games/sdl2_gears/assets"
+ cp -v "sdl2_gears" "$dest/usr/games/sdl2_gears/sdl2_gears"
+ cp -v "assets/image.png" "$dest/usr/games/sdl2_gears/assets/image.png"
+ cp -v "assets/music.wav" "$dest/usr/games/sdl2_gears/assets/music.wav"
+ cp -v "assets/font.ttf" "$dest/usr/games/sdl2_gears/assets/font.ttf"
skip=1
}
diff --git a/recipes/games/classicube/manifest b/recipes/games/classicube/manifest
index e089d0848..681eca1be 100644
--- a/recipes/games/classicube/manifest
+++ b/recipes/games/classicube/manifest
@@ -1,4 +1,4 @@
name=ClassiCube
category=Games
-binary=/games/classicube/ClassiCube
+binary=/usr/games/classicube/ClassiCube
icon=/ui/icons/apps/classicube.png
diff --git a/recipes/games/classicube/recipe.toml b/recipes/games/classicube/recipe.toml
index c65eb8e69..591968213 100644
--- a/recipes/games/classicube/recipe.toml
+++ b/recipes/games/classicube/recipe.toml
@@ -15,8 +15,8 @@ rsync -av --delete "${COOKBOOK_SOURCE}/" ./
"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" -C src redox
-mkdir -pv "${COOKBOOK_STAGE}/games/classicube"
-cp -v "src/ClassiCube" "${COOKBOOK_STAGE}/games/classicube"
+mkdir -pv "${COOKBOOK_STAGE}/usr/games/classicube"
+cp -v "src/ClassiCube" "${COOKBOOK_STAGE}/usr/games/classicube"
mkdir -pv "${COOKBOOK_STAGE}/ui/apps"
cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/ui/apps/classicube"
diff --git a/recipes/games/eduke32/manifest b/recipes/games/eduke32/manifest
index abb25f8f9..27dfe096c 100644
--- a/recipes/games/eduke32/manifest
+++ b/recipes/games/eduke32/manifest
@@ -1,4 +1,4 @@
name=EDuke32
category=Games
-binary=/games/eduke32
+binary=/usr/games/eduke32
icon=/ui/icons/apps/eduke32.png
diff --git a/recipes/games/eduke32/recipe.toml b/recipes/games/eduke32/recipe.toml
index e150b2c87..b0532d44b 100644
--- a/recipes/games/eduke32/recipe.toml
+++ b/recipes/games/eduke32/recipe.toml
@@ -23,9 +23,9 @@ export SDLCONFIG="${COOKBOOK_SYSROOT}/bin/sdl-config --prefix=${COOKBOOK_SYSROOT
PLATFORM=REDOX "${COOKBOOK_MAKE}" -j"$($NPROC)"
-mkdir -pv "${COOKBOOK_STAGE}/games"
-cp -v ./eduke32 "${COOKBOOK_STAGE}/games/eduke32"
-cp -v ./mapster32 "${COOKBOOK_STAGE}/games/mapster32"
+mkdir -pv "${COOKBOOK_STAGE}/usr/games"
+cp -v ./eduke32 "${COOKBOOK_STAGE}/usr/games/eduke32"
+cp -v ./mapster32 "${COOKBOOK_STAGE}/usr/games/mapster32"
mkdir -pv "${COOKBOOK_STAGE}/ui/apps"
cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/ui/apps/eduke32"
diff --git a/recipes/games/freedoom/recipe.toml b/recipes/games/freedoom/recipe.toml
index 3a4be6ed4..fdba3bed0 100644
--- a/recipes/games/freedoom/recipe.toml
+++ b/recipes/games/freedoom/recipe.toml
@@ -4,7 +4,7 @@ git = "https://gitlab.redox-os.org/redox-os/freedoom.git"
[build]
template = "custom"
script = """
-mkdir -pv "${COOKBOOK_STAGE}/games" "${COOKBOOK_STAGE}/share/games/doom" "${COOKBOOK_STAGE}/ui/apps" "${COOKBOOK_STAGE}/ui/icons/apps"
+mkdir -pv "${COOKBOOK_STAGE}/usr/games" "${COOKBOOK_STAGE}/share/games/doom" "${COOKBOOK_STAGE}/ui/apps" "${COOKBOOK_STAGE}/ui/icons/apps"
for file in "${COOKBOOK_SOURCE}/"*.wad
do
game="$(basename "$file" .wad)"
@@ -12,14 +12,14 @@ do
wad="/share/games/doom/$game.wad"
cp -v "$file" "${COOKBOOK_STAGE}$wad"
- bin="/games/$game"
+ bin="/usr/games/$game"
echo "#!/bin/ion" > "${COOKBOOK_STAGE}$bin"
- echo "/games/prboom -geom 800x600 -vidmode 32 -iwad $wad" >> "${COOKBOOK_STAGE}$bin"
+ echo "/usr/games/prboom -geom 800x600 -vidmode 32 -iwad $wad" >> "${COOKBOOK_STAGE}$bin"
chmod +x "${COOKBOOK_STAGE}$bin"
echo "name=$game" | sed 's/freedoom/FreeDOOM: Phase /' | sed 's/doom1/DOOM (Shareware)/' > "${COOKBOOK_STAGE}/ui/apps/$game"
echo "category=Games" >> "${COOKBOOK_STAGE}/ui/apps/$game"
- echo "binary=/games/$game" >> "${COOKBOOK_STAGE}/ui/apps/$game"
+ echo "binary=/usr/games/$game" >> "${COOKBOOK_STAGE}/ui/apps/$game"
echo "icon=/ui/icons/apps/$game.png" >> "${COOKBOOK_STAGE}/ui/apps/$game"
cp -v "${COOKBOOK_SOURCE}/$game.png" "${COOKBOOK_STAGE}/ui/icons/apps/$game.png"
diff --git a/recipes/games/neverball/manifest-neverball b/recipes/games/neverball/manifest-neverball
index 70330ee2a..431aadb30 100644
--- a/recipes/games/neverball/manifest-neverball
+++ b/recipes/games/neverball/manifest-neverball
@@ -1,4 +1,4 @@
name=Neverball
category=Games
-binary=/games/neverball/neverball
+binary=/usr/games/neverball/neverball
icon=/ui/icons/apps/neverball.png
diff --git a/recipes/games/neverball/manifest-neverputt b/recipes/games/neverball/manifest-neverputt
index f0c0febc3..debe4f673 100644
--- a/recipes/games/neverball/manifest-neverputt
+++ b/recipes/games/neverball/manifest-neverputt
@@ -1,4 +1,4 @@
name=Neverputt
category=Games
-binary=/games/neverball/neverputt
+binary=/usr/games/neverball/neverputt
icon=/ui/icons/apps/neverputt.png
diff --git a/recipes/games/neverball/recipe.sh b/recipes/games/neverball/recipe.sh
index 4c12afda1..ba83e15e8 100644
--- a/recipes/games/neverball/recipe.sh
+++ b/recipes/games/neverball/recipe.sh
@@ -32,16 +32,16 @@ function recipe_stage {
dest="$(realpath $1)"
# Create install directories
- mkdir -pv "${dest}/games/neverball" "${dest}/ui/apps" "${dest}/ui/icons/apps"
+ mkdir -pv "${dest}/usr/games/neverball" "${dest}/ui/apps" "${dest}/ui/icons/apps"
# Copy assets
- cp -rv data "${dest}/games/neverball"
+ cp -rv data "${dest}/usr/games/neverball"
# For each game
for bin in neverball neverputt
do
# Install binary
- "${STRIP}" -v "${bin}" -o "${dest}/games/neverball/${bin}"
+ "${STRIP}" -v "${bin}" -o "${dest}/usr/games/neverball/${bin}"
# Install manifest
cp -v "${COOKBOOK_RECIPE}/manifest-${bin}" "${dest}/ui/apps/${bin}"
diff --git a/recipes/games/vvvvvv/recipe.sh b/recipes/games/vvvvvv/recipe.sh
index 28649e576..531e3697b 100644
--- a/recipes/games/vvvvvv/recipe.sh
+++ b/recipes/games/vvvvvv/recipe.sh
@@ -32,7 +32,7 @@ function recipe_clean {
function recipe_stage {
dest="$(realpath $1)"
- mkdir -pv "$1/games/vvvvvv"
- cp ./desktop_version/VVVVVV "$1/games/vvvvvv"
+ mkdir -pv "$1/usr/games/vvvvvv"
+ cp ./desktop_version/VVVVVV "$1/usr/games/vvvvvv"
skip=1
}
--
GitLab