From 3be4beaabb2fb0cd3c549d3dd469150dfb2f7e07 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Thu, 29 Jan 2026 05:25:12 +0700 Subject: [PATCH] Move all ui dir --- recipes/demos/pixelcannon/recipe.toml | 4 ++-- recipes/emulators/dosbox/recipe.toml | 8 ++++---- recipes/games/classicube/recipe.toml | 8 ++++---- recipes/games/eduke32/recipe.toml | 8 ++++---- recipes/games/freedoom/recipe.toml | 12 ++++++------ recipes/games/gigalomania/recipe.toml | 8 ++++---- recipes/games/neverball/recipe.toml | 6 +++--- recipes/games/openjazz/recipe.toml | 2 +- recipes/games/sm64ex/recipe.toml | 8 ++++---- recipes/gui/installer-gui/recipe.toml | 4 ++-- recipes/gui/orbterm/recipe.toml | 4 ++-- recipes/gui/orbutils/recipe.toml | 4 ++-- recipes/libs/ffmpeg6/recipe.toml | 4 ++-- recipes/tools/cosmic-edit/recipe.toml | 4 ++-- recipes/tools/cosmic-files/recipe.toml | 4 ++-- recipes/tools/cosmic-reader/recipe.toml | 4 ++-- recipes/tools/cosmic-term/recipe.toml | 4 ++-- recipes/tools/periodictable/recipe.toml | 8 ++++---- recipes/tools/sodium/recipe.toml | 8 ++++---- .../games/data/openjazz-shareware-data/recipe.toml | 2 +- recipes/wip/players/cosmic-player/recipe.toml | 4 ++-- 21 files changed, 59 insertions(+), 59 deletions(-) diff --git a/recipes/demos/pixelcannon/recipe.toml b/recipes/demos/pixelcannon/recipe.toml index 709e3d97..be0f75b8 100644 --- a/recipes/demos/pixelcannon/recipe.toml +++ b/recipes/demos/pixelcannon/recipe.toml @@ -9,8 +9,8 @@ cookbook_cargo mkdir -pv "${COOKBOOK_STAGE}/apps/pixelcannon" cp -Rv "${COOKBOOK_SOURCE}/assets" "${COOKBOOK_STAGE}/apps/pixelcannon" -mkdir -pv "${COOKBOOK_STAGE}/ui/apps" -cp -v "${COOKBOOK_SOURCE}/manifest" "${COOKBOOK_STAGE}/ui/apps/pixelcannon" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps" +cp -v "${COOKBOOK_SOURCE}/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/pixelcannon" """ [package] diff --git a/recipes/emulators/dosbox/recipe.toml b/recipes/emulators/dosbox/recipe.toml index 61e31fc9..02801a6f 100644 --- a/recipes/emulators/dosbox/recipe.toml +++ b/recipes/emulators/dosbox/recipe.toml @@ -25,9 +25,9 @@ COOKBOOK_CONFIGURE_FLAGS+=( ) cookbook_configure -mkdir -pv "${COOKBOOK_STAGE}/ui/apps" -cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/ui/apps/dosbox" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps" +cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/dosbox" -mkdir -pv "${COOKBOOK_STAGE}/ui/icons/apps" -cp -v "${COOKBOOK_RECIPE}/icon.png" "${COOKBOOK_STAGE}/ui/icons/apps/dosbox.png" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/icons/apps" +cp -v "${COOKBOOK_RECIPE}/icon.png" "${COOKBOOK_STAGE}/usr/share/icons/apps/dosbox.png" """ diff --git a/recipes/games/classicube/recipe.toml b/recipes/games/classicube/recipe.toml index 083f334b..f2153f12 100644 --- a/recipes/games/classicube/recipe.toml +++ b/recipes/games/classicube/recipe.toml @@ -17,9 +17,9 @@ rsync -av --delete "${COOKBOOK_SOURCE}/" ./ 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" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps" +cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/classicube" -mkdir -pv "${COOKBOOK_STAGE}/ui/icons/apps" -cp -v "${COOKBOOK_SOURCE}/misc/CCicon.png" "${COOKBOOK_STAGE}/ui/icons/apps/classicube.png" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/icons/apps" +cp -v "${COOKBOOK_SOURCE}/misc/CCicon.png" "${COOKBOOK_STAGE}/usr/share/icons/apps/classicube.png" """ diff --git a/recipes/games/eduke32/recipe.toml b/recipes/games/eduke32/recipe.toml index 9f256299..0905b62c 100644 --- a/recipes/games/eduke32/recipe.toml +++ b/recipes/games/eduke32/recipe.toml @@ -28,9 +28,9 @@ 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" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps" +cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/eduke32" -mkdir -pv "${COOKBOOK_STAGE}/ui/icons/apps" -cp -v "${COOKBOOK_RECIPE}/icon.png" "${COOKBOOK_STAGE}/ui/icons/apps/eduke32.png" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/icons/apps" +cp -v "${COOKBOOK_RECIPE}/icon.png" "${COOKBOOK_STAGE}/usr/share/icons/apps/eduke32.png" """ diff --git a/recipes/games/freedoom/recipe.toml b/recipes/games/freedoom/recipe.toml index fdba3bed..af59f6f6 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}/usr/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}/usr/share/ui/apps" "${COOKBOOK_STAGE}/usr/share/icons/apps" for file in "${COOKBOOK_SOURCE}/"*.wad do game="$(basename "$file" .wad)" @@ -17,12 +17,12 @@ do 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=/usr/games/$game" >> "${COOKBOOK_STAGE}/ui/apps/$game" - echo "icon=/ui/icons/apps/$game.png" >> "${COOKBOOK_STAGE}/ui/apps/$game" + echo "name=$game" | sed 's/freedoom/FreeDOOM: Phase /' | sed 's/doom1/DOOM (Shareware)/' > "${COOKBOOK_STAGE}/usr/share/ui/apps/$game" + echo "category=Games" >> "${COOKBOOK_STAGE}/usr/share/ui/apps/$game" + echo "binary=/usr/games/$game" >> "${COOKBOOK_STAGE}/usr/share/ui/apps/$game" + echo "icon=/ui/icons/apps/$game.png" >> "${COOKBOOK_STAGE}/usr/share/ui/apps/$game" - cp -v "${COOKBOOK_SOURCE}/$game.png" "${COOKBOOK_STAGE}/ui/icons/apps/$game.png" + cp -v "${COOKBOOK_SOURCE}/$game.png" "${COOKBOOK_STAGE}/usr/share/icons/apps/$game.png" done """ diff --git a/recipes/games/gigalomania/recipe.toml b/recipes/games/gigalomania/recipe.toml index 95f26d36..591d7a4a 100644 --- a/recipes/games/gigalomania/recipe.toml +++ b/recipes/games/gigalomania/recipe.toml @@ -28,9 +28,9 @@ export CPPHOST="${TARGET}-g++" rm -rf "${COOKBOOK_STAGE}/bundle" -mkdir -pv "${COOKBOOK_STAGE}/ui/apps" -cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/ui/apps/gigalomania" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps" +cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/gigalomania" -mkdir -pv "${COOKBOOK_STAGE}/ui/icons/apps" -cp -v "gigalomania64.png" "${COOKBOOK_STAGE}/ui/icons/apps/gigalomania.png" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/icons/apps" +cp -v "gigalomania64.png" "${COOKBOOK_STAGE}/usr/share/icons/apps/gigalomania.png" """ \ No newline at end of file diff --git a/recipes/games/neverball/recipe.toml b/recipes/games/neverball/recipe.toml index 7a525e40..bf6da23e 100644 --- a/recipes/games/neverball/recipe.toml +++ b/recipes/games/neverball/recipe.toml @@ -34,7 +34,7 @@ env -i \ "${COOKBOOK_MAKE}" -j"${COOKBOOK_MAKE_JOBS}" ENABLE_FS=stdio ENABLE_NLS=0 neverball neverputt # Create install directories -mkdir -pv "${COOKBOOK_STAGE}/usr/games/neverball" "${COOKBOOK_STAGE}/ui/apps" "${COOKBOOK_STAGE}/ui/icons/apps" +mkdir -pv "${COOKBOOK_STAGE}/usr/games/neverball" "${COOKBOOK_STAGE}/usr/share/ui/apps" "${COOKBOOK_STAGE}/usr/share/icons/apps" # Copy assets cp -rv data "${COOKBOOK_STAGE}/usr/games/neverball" @@ -46,9 +46,9 @@ do "${STRIP}" -v "${bin}" -o "${COOKBOOK_STAGE}/usr/games/neverball/${bin}" # Install manifest - cp -v "${COOKBOOK_RECIPE}/manifest-${bin}" "${COOKBOOK_STAGE}/ui/apps/${bin}" + cp -v "${COOKBOOK_RECIPE}/manifest-${bin}" "${COOKBOOK_STAGE}/usr/share/ui/apps/${bin}" # Install icon - cp -v "dist/${bin}_64.png" "${COOKBOOK_STAGE}/ui/icons/apps/${bin}.png" + cp -v "dist/${bin}_64.png" "${COOKBOOK_STAGE}/usr/share/icons/apps/${bin}.png" done """ diff --git a/recipes/games/openjazz/recipe.toml b/recipes/games/openjazz/recipe.toml index 676b85c6..85d2b495 100644 --- a/recipes/games/openjazz/recipe.toml +++ b/recipes/games/openjazz/recipe.toml @@ -33,7 +33,7 @@ cookbook_configure ASSETS_DIR="${COOKBOOK_STAGE}${DATAPATH}" INSTALL_DIR="${COOKBOOK_STAGE}/usr/games" -ICON_DIR="${COOKBOOK_STAGE}/ui/icons/apps" +ICON_DIR="${COOKBOOK_STAGE}/usr/share/icons/apps" MAN_ROOT="${COOKBOOK_STAGE}/usr/share/man" mkdir -p "${ASSETS_DIR}" "${INSTALL_DIR}" "${ICON_DIR}" "${MAN_ROOT}" diff --git a/recipes/games/sm64ex/recipe.toml b/recipes/games/sm64ex/recipe.toml index 10992c48..56147a71 100644 --- a/recipes/games/sm64ex/recipe.toml +++ b/recipes/games/sm64ex/recipe.toml @@ -28,9 +28,9 @@ export CROSS="${TARGET}-" mkdir -p "${COOKBOOK_STAGE}/bin" cp -v build/us_pc/sm64.us.f3dex2e "${COOKBOOK_STAGE}/bin/sm64" -mkdir -pv "${COOKBOOK_STAGE}/ui/apps" -cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/ui/apps/sm64ex" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps" +cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/sm64ex" -mkdir -pv "${COOKBOOK_STAGE}/ui/icons/apps" -wget -O "${COOKBOOK_STAGE}/ui/icons/apps/sm64ex.png" https://evilgames.eu/texture-packs/thumb/sm64-reloaded.png +mkdir -pv "${COOKBOOK_STAGE}/usr/share/icons/apps" +wget -O "${COOKBOOK_STAGE}/usr/share/icons/apps/sm64ex.png" https://evilgames.eu/texture-packs/thumb/sm64-reloaded.png """ diff --git a/recipes/gui/installer-gui/recipe.toml b/recipes/gui/installer-gui/recipe.toml index 4f95b53d..a825566d 100644 --- a/recipes/gui/installer-gui/recipe.toml +++ b/recipes/gui/installer-gui/recipe.toml @@ -7,6 +7,6 @@ script = """ DYNAMIC_INIT cookbook_cargo -mkdir -pv "${COOKBOOK_STAGE}/ui/apps" -cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/ui/apps/redox-installer-gui" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps" +cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/redox-installer-gui" """ diff --git a/recipes/gui/orbterm/recipe.toml b/recipes/gui/orbterm/recipe.toml index e67f2a1c..8fad2c42 100644 --- a/recipes/gui/orbterm/recipe.toml +++ b/recipes/gui/orbterm/recipe.toml @@ -5,8 +5,8 @@ git = "https://gitlab.redox-os.org/redox-os/orbterm.git" template = "custom" script = """ DYNAMIC_INIT -mkdir -pv "${COOKBOOK_STAGE}/ui" -cp -rv "${COOKBOOK_SOURCE}/apps" "${COOKBOOK_STAGE}/ui/apps" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui" +cp -rv "${COOKBOOK_SOURCE}/apps" "${COOKBOOK_STAGE}/usr/share/ui/apps" "${COOKBOOK_CARGO}" install \ --path "${COOKBOOK_SOURCE}" \ diff --git a/recipes/gui/orbutils/recipe.toml b/recipes/gui/orbutils/recipe.toml index bc506edf..d9d8062d 100644 --- a/recipes/gui/orbutils/recipe.toml +++ b/recipes/gui/orbutils/recipe.toml @@ -5,8 +5,8 @@ git = "https://gitlab.redox-os.org/redox-os/orbutils.git" template = "custom" script = """ DYNAMIC_INIT -mkdir -pv "${COOKBOOK_STAGE}/ui" -cp -rv "${COOKBOOK_SOURCE}/apps" "${COOKBOOK_STAGE}/ui/apps" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui" +cp -rv "${COOKBOOK_SOURCE}/apps" "${COOKBOOK_STAGE}/usr/share/ui/apps" for project in orbutils calculator launcher do diff --git a/recipes/libs/ffmpeg6/recipe.toml b/recipes/libs/ffmpeg6/recipe.toml index 8f15ca3a..09f82834 100644 --- a/recipes/libs/ffmpeg6/recipe.toml +++ b/recipes/libs/ffmpeg6/recipe.toml @@ -35,6 +35,6 @@ COOKBOOK_CONFIGURE_FLAGS=( --enable-decoder=png ) cookbook_configure -mkdir -pv "${COOKBOOK_STAGE}/ui/apps" -cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/ui/apps/ffplay" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps" +cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/ffplay" """ diff --git a/recipes/tools/cosmic-edit/recipe.toml b/recipes/tools/cosmic-edit/recipe.toml index bd7c4482..e8885eeb 100644 --- a/recipes/tools/cosmic-edit/recipe.toml +++ b/recipes/tools/cosmic-edit/recipe.toml @@ -6,8 +6,8 @@ branch = "master" template = "custom" script = """ cookbook_cargo --no-default-features -mkdir -pv "${COOKBOOK_STAGE}/ui/apps" -cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/ui/apps/30_cosmic-edit" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps" +cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/30_cosmic-edit" #TODO: install with just? APPID="com.system76.CosmicEdit" mkdir -pv "${COOKBOOK_STAGE}/usr/share/applications/" diff --git a/recipes/tools/cosmic-files/recipe.toml b/recipes/tools/cosmic-files/recipe.toml index 93295747..6ecb0649 100644 --- a/recipes/tools/cosmic-files/recipe.toml +++ b/recipes/tools/cosmic-files/recipe.toml @@ -23,8 +23,8 @@ export GETTEXT_DIR="${COOKBOOK_SYSROOT}" -C link-arg="-liconv" mkdir -pv "${COOKBOOK_STAGE}/usr/bin/" cp -v "target/${TARGET}/release/cosmic-files" "${COOKBOOK_STAGE}/usr/bin/" -mkdir -pv "${COOKBOOK_STAGE}/ui/apps/" -cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/ui/apps/20_cosmic-files" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps/" +cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/20_cosmic-files" #TODO: install with just? APPID="com.system76.CosmicFiles" mkdir -pv "${COOKBOOK_STAGE}/usr/share/applications/" diff --git a/recipes/tools/cosmic-reader/recipe.toml b/recipes/tools/cosmic-reader/recipe.toml index 01619a80..34e39227 100644 --- a/recipes/tools/cosmic-reader/recipe.toml +++ b/recipes/tools/cosmic-reader/recipe.toml @@ -24,8 +24,8 @@ export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=${COOKBOOK_HOST_SYSROOT}/${GNU_TARGET -C link-args="-lpng -lexpat" mkdir -pv "${COOKBOOK_STAGE}/usr/bin/" cp -v "target/${TARGET}/release/cosmic-reader" "${COOKBOOK_STAGE}/usr/bin/" -mkdir -pv "${COOKBOOK_STAGE}/ui/apps" -cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/ui/apps/40_cosmic-reader" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps" +cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/40_cosmic-reader" #TODO: install with just? APPID="com.system76.CosmicReader" mkdir -pv "${COOKBOOK_STAGE}/usr/share/applications/" diff --git a/recipes/tools/cosmic-term/recipe.toml b/recipes/tools/cosmic-term/recipe.toml index 338b04fa..69296397 100644 --- a/recipes/tools/cosmic-term/recipe.toml +++ b/recipes/tools/cosmic-term/recipe.toml @@ -7,8 +7,8 @@ template = "custom" script = """ DYNAMIC_INIT cookbook_cargo --no-default-features -mkdir -pv "${COOKBOOK_STAGE}/ui/apps" -cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/ui/apps/10_cosmic-term" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps" +cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/10_cosmic-term" #TODO: install with just? APPID="com.system76.CosmicTerm" mkdir -pv "${COOKBOOK_STAGE}/usr/share/applications/" diff --git a/recipes/tools/periodictable/recipe.toml b/recipes/tools/periodictable/recipe.toml index 109b3d42..89183b0b 100644 --- a/recipes/tools/periodictable/recipe.toml +++ b/recipes/tools/periodictable/recipe.toml @@ -6,10 +6,10 @@ template = "custom" script = """ DYNAMIC_INIT cookbook_cargo -mkdir -pv "${COOKBOOK_STAGE}/ui/apps" -cp -v "${COOKBOOK_SOURCE}/pkg/manifest" "${COOKBOOK_STAGE}/ui/apps/periodictable" -mkdir -pv "${COOKBOOK_STAGE}/ui/icons" -cp -v "${COOKBOOK_SOURCE}/pkg/icon.png" "${COOKBOOK_STAGE}/ui/icons/periodictable.png" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps" +cp -v "${COOKBOOK_SOURCE}/pkg/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/periodictable" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/icons" +cp -v "${COOKBOOK_SOURCE}/pkg/icon.png" "${COOKBOOK_STAGE}/usr/share/icons/periodictable.png" """ [package] diff --git a/recipes/tools/sodium/recipe.toml b/recipes/tools/sodium/recipe.toml index 66fe407f..f4282493 100644 --- a/recipes/tools/sodium/recipe.toml +++ b/recipes/tools/sodium/recipe.toml @@ -12,8 +12,8 @@ DYNAMIC_INIT --no-track \ --features orbital -mkdir -pv "${COOKBOOK_STAGE}/ui/apps" -cp -v ${COOKBOOK_SOURCE}/manifest "${COOKBOOK_STAGE}/ui/apps/sodium" -mkdir -pv "${COOKBOOK_STAGE}/ui/icons" -cp -v ${COOKBOOK_SOURCE}/icon.png "${COOKBOOK_STAGE}/ui/icons/sodium.png" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps" +cp -v ${COOKBOOK_SOURCE}/manifest "${COOKBOOK_STAGE}/usr/share/ui/apps/sodium" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/icons" +cp -v ${COOKBOOK_SOURCE}/icon.png "${COOKBOOK_STAGE}/usr/share/icons/sodium.png" """ diff --git a/recipes/wip/games/data/openjazz-shareware-data/recipe.toml b/recipes/wip/games/data/openjazz-shareware-data/recipe.toml index 3fca5d81..3e7fe3fd 100644 --- a/recipes/wip/games/data/openjazz-shareware-data/recipe.toml +++ b/recipes/wip/games/data/openjazz-shareware-data/recipe.toml @@ -4,7 +4,7 @@ template = "custom" script = """ ASSETS_DIR="${COOKBOOK_STAGE}/usr/share/games/openjazz/" -APP_DIR="${COOKBOOK_STAGE}/ui/apps" +APP_DIR="${COOKBOOK_STAGE}/usr/share/ui/apps" curl -vJL https://archive.org/download/jazz-jackrabbit/Jazz%20Jackrabbit.rar -o jazzdemo.rar sha256sum -c "${COOKBOOK_RECIPE}/jazzdemo.rar.sha" diff --git a/recipes/wip/players/cosmic-player/recipe.toml b/recipes/wip/players/cosmic-player/recipe.toml index c876bf14..db1b5504 100644 --- a/recipes/wip/players/cosmic-player/recipe.toml +++ b/recipes/wip/players/cosmic-player/recipe.toml @@ -25,8 +25,8 @@ DYNAMIC_INIT -C link-args="-lgmodule-2.0 -lffi -liconv -lpcre2-8 -lz" mkdir -pv "${COOKBOOK_STAGE}/usr/bin/" cp -v "target/${TARGET}/release/cosmic-player" "${COOKBOOK_STAGE}/usr/bin/" -mkdir -pv "${COOKBOOK_STAGE}/ui/apps/" -cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/ui/apps/cosmic-player" +mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps/" +cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/cosmic-player" #TODO: install with just? APPID="com.system76.CosmicPlayer" mkdir -pv "${COOKBOOK_STAGE}/usr/share/applications/"