From 082e85f2bee38414a6a161710103e51c432c07ea Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 22 Jul 2010 14:18:09 +0200 Subject: [PATCH] [molecule.examples.scripts] update example scripts to work with Entropy >=0.99.48 --- examples/scripts/inner_source_chroot_update.sh | 2 +- examples/scripts/remaster_post.sh | 2 +- examples/scripts/remaster_pre.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/scripts/inner_source_chroot_update.sh b/examples/scripts/inner_source_chroot_update.sh index 36b0dd3..6bd5ec4 100755 --- a/examples/scripts/inner_source_chroot_update.sh +++ b/examples/scripts/inner_source_chroot_update.sh @@ -17,6 +17,6 @@ export FORCE_EAPI=2 equo update || ( sleep 1200 && equo update ) || exit 1 equo upgrade || exit 1 echo "-5" | equo conf update -rm -rf /var/lib/entropy/packages* +rm -rf /var/lib/entropy/client/packages equo query list installed -qv > /etc/sabayon-pkglist diff --git a/examples/scripts/remaster_post.sh b/examples/scripts/remaster_post.sh index e2e7c41..7c3d93a 100755 --- a/examples/scripts/remaster_post.sh +++ b/examples/scripts/remaster_post.sh @@ -1,6 +1,6 @@ #!/bin/sh PKGS_DIR="/sabayon/remaster/pkgs" -CHROOT_PKGS_DIR="${CHROOT_DIR}/var/lib/entropy/packages" +CHROOT_PKGS_DIR="${CHROOT_DIR}/var/lib/entropy/client/packages" echo "Merging back packages" cp "${CHROOT_PKGS_DIR}"/* "${PKGS_DIR}"/ -Ra diff --git a/examples/scripts/remaster_pre.sh b/examples/scripts/remaster_pre.sh index e22818b..7b10958 100755 --- a/examples/scripts/remaster_pre.sh +++ b/examples/scripts/remaster_pre.sh @@ -1,6 +1,6 @@ #!/bin/sh PKGS_DIR="/sabayon/remaster/pkgs" -CHROOT_PKGS_DIR="${CHROOT_DIR}/var/lib/entropy/packages" +CHROOT_PKGS_DIR="${CHROOT_DIR}/var/lib/entropy/client/packages" [[ ! -d "${PKGS_DIR}" ]] && mkdir -p "${PKGS_DIR}" [[ ! -d "${CHROOT_PKGS_DIR}" ]] && mkdir -p "${CHROOT_PKGS_DIR}"