summaryrefslogtreecommitdiff
path: root/virtual
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2016-07-25 20:26:48 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2016-07-25 20:26:48 +0100
commit06cdb8b21684a2ff45c664eb932424dd0562ea56 (patch)
tree790d09ede4936dd3e82238ce519d86e7d8827ec3 /virtual
parentSwap retired ksnapshot for spectacle (diff)
downloadportage-06cdb8b21684a2ff45c664eb932424dd0562ea56.tar.bz2
portage-06cdb8b21684a2ff45c664eb932424dd0562ea56.tar.xz
portage-06cdb8b21684a2ff45c664eb932424dd0562ea56.zip
Extract settings with portageq, not emerge --info hack
Diffstat (limited to 'virtual')
-rwxr-xr-xvirtual/miller-base/files/update-install23
-rwxr-xr-xvirtual/miller-base/files/write-new-updates2
2 files changed, 3 insertions, 2 deletions
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"