Move most games from /games to /usr/games

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()
 {

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
 }

recipes/games/classicube/manifest

 name=ClassiCube
 category=Games
-binary=/games/classicube/ClassiCube
+binary=/usr/games/classicube/ClassiCube
 icon=/ui/icons/apps/classicube.png

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"

recipes/games/eduke32/manifest

 name=EDuke32
 category=Games
-binary=/games/eduke32
+binary=/usr/games/eduke32
 icon=/ui/icons/apps/eduke32.png

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"

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"

recipes/games/neverball/manifest-neverball

 name=Neverball
 category=Games
-binary=/games/neverball/neverball
+binary=/usr/games/neverball/neverball
 icon=/ui/icons/apps/neverball.png

recipes/games/neverball/manifest-neverputt

 name=Neverputt
 category=Games
-binary=/games/neverball/neverputt
+binary=/usr/games/neverball/neverputt
 icon=/ui/icons/apps/neverputt.png

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}"

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
 }