From 06cdb8b21684a2ff45c664eb932424dd0562ea56 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Mon, 25 Jul 2016 20:26:48 +0100 Subject: Extract settings with portageq, not emerge --info hack --- virtual/miller-base/files/update-install2 | 3 ++- virtual/miller-base/files/write-new-updates | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'virtual') diff --git a/virtual/miller-base/files/update-install2 b/virtual/miller-base/files/update-install2 index b40f8eb..e5cf5d9 100755 --- a/virtual/miller-base/files/update-install2 +++ b/virtual/miller-base/files/update-install2 @@ -1,7 +1,8 @@ #!/bin/bash unset ABI ABI_X86 -eval $(emerge --info -v | grep '^\(EMERGEEXTRAOPTS\|UPDATESTATEDIR\)="[^"]*"$') +EMERGEEXTRAOPTS=$(portageq envvar EMERGEEXTRAOPTS) +UPDATESTATEDIR=$(portageq envvar UPDATESTATEDIR) updates="${UPDATESTATEDIR:-/tmp}/`hostname`_updates.txt" depcleans="${UPDATESTATEDIR:-/tmp}/`hostname`_depclean.txt" diff --git a/virtual/miller-base/files/write-new-updates b/virtual/miller-base/files/write-new-updates index 7b9b6cc..04b01df 100755 --- a/virtual/miller-base/files/write-new-updates +++ b/virtual/miller-base/files/write-new-updates @@ -1,7 +1,7 @@ #!/bin/bash unset ABI ABI_X86 -eval $(emerge --info -v | grep '^UPDATESTATEDIR="[^"]*"$') +UPDATESTATEDIR=$(portageq envvar UPDATESTATEDIR) updates="${UPDATESTATEDIR:-/tmp}/`hostname`_updates.txt" tmp="/tmp/$$.updates" -- cgit v1.2.3