* [gentoo-commits] proj/sandbox:master commit in: data/
@ 2011-07-04 23:06 Mike Frysinger
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger @ 2011-07-04 23:06 UTC (permalink / raw
To: gentoo-commits
commit: 90b5d930ae9163a749b35c3b97f17a010136f976
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 1 08:41:42 2011 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 1 08:41:42 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sandbox.git;a=commit;h=90b5d930
sandbox.bashrc: support newer /etc/portage files
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
---
data/sandbox.bashrc | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/data/sandbox.bashrc b/data/sandbox.bashrc
index 39d4d1a..7601d35 100644
--- a/data/sandbox.bashrc
+++ b/data/sandbox.bashrc
@@ -54,15 +54,16 @@ if [[ ${SANDBOX_INTRACTV} == "1" && -t 1 ]] || [[ ${__SANDBOX_TESTING} == "yes"
# build area or not ... uNF uNF uNF
#sbs_pdir=$(portageq envvar PORTAGE_TMPDIR)/portage/ #portageq takes too long imo
if [[ -z ${PORTAGE_TMPDIR} ]] ; then
- sbs_gpdir=$( source /etc/make.globals && echo $PORTAGE_TMPDIR 2> /dev/null)
- sbs_cpdir=$( source /etc/make.conf && echo $PORTAGE_TMPDIR 2> /dev/null)
- [[ -z ${sbs_cpdir} ]] \
- && sbs_pdir=${sbs_gpdir} \
- || sbs_pdir=${sbs_cpdir}
+ sbs_pdir=$(
+ for f in /etc/{,portage/}make.globals /etc/{,portage/}make.conf ; do
+ [[ -e ${f} ]] && source ${f}
+ done
+ echo $PORTAGE_TMPDIR
+ )
else
sbs_pdir=${PORTAGE_TMPDIR}
fi
- [[ -z ${sbs_pdir} ]] && sbs_pdir=/var/tmp
+ : ${sbs_pdir:=/var/tmp}
sbs_pdir=${sbs_pdir}/portage/
if [[ ${PWD:0:${#sbs_pdir}} == "${sbs_pdir}" ]] ; then
@@ -85,7 +86,7 @@ if [[ ${SANDBOX_INTRACTV} == "1" && -t 1 ]] || [[ ${__SANDBOX_TESTING} == "yes"
fi
fi
- unset sbs_gpdir sbs_cpdir sbs_pdir sbs_bdir sbs_tmpenvfile sbs_PREPWD env
+ unset sbs_pdir sbs_bdir sbs_tmpenvfile sbs_PREPWD env
fi
cd "${PWD}"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/sandbox:master commit in: data/
@ 2012-11-17 19:16 Mike Frysinger
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger @ 2012-11-17 19:16 UTC (permalink / raw
To: gentoo-commits
commit: 00044ab0c8aaaabf048b5ff0ec2da5b3d7d25752
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 17 19:14:26 2012 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Nov 17 19:15:58 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sandbox.git;a=commit;h=00044ab0
sandbox.desktop: drop .svg from Icon field
URL: http://bugs.gentoo.org/443672
Reported-by: Petteri Räty <betelgeuse <AT> gentoo.org>
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
---
data/sandbox.desktop | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/data/sandbox.desktop b/data/sandbox.desktop
index 5b5b576..27a887e 100644
--- a/data/sandbox.desktop
+++ b/data/sandbox.desktop
@@ -5,6 +5,6 @@ Type=Application
Comment=launch a sandboxed shell ... useful for debugging ebuilds
Exec=sandbox
TryExec=sandbox
-Icon=sandbox.svg
+Icon=sandbox
Categories=Development;
Terminal=true
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/sandbox:master commit in: data/
@ 2021-05-04 8:50 Sergei Trofimovich
0 siblings, 0 replies; 7+ messages in thread
From: Sergei Trofimovich @ 2021-05-04 8:50 UTC (permalink / raw
To: gentoo-commits
commit: f92049703da21591fe399308d47cedd2ea298d06
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue May 4 08:40:41 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue May 4 08:40:41 2021 +0000
URL: https://gitweb.gentoo.org/proj/sandbox.git/commit/?id=f9204970
sandbox.bashrc: don't alias 'make'
We already set LD_PRELOAD environment variable. That should be enough to
propagate it's effect. Let's keep make's argv unmodified.
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
data/sandbox.bashrc | 1 -
1 file changed, 1 deletion(-)
diff --git a/data/sandbox.bashrc b/data/sandbox.bashrc
index 7601d35..252e0aa 100644
--- a/data/sandbox.bashrc
+++ b/data/sandbox.bashrc
@@ -9,7 +9,6 @@ fi
export BASH_ENV="${SANDBOX_BASHRC}"
-alias make="make LD_PRELOAD=${LD_PRELOAD}"
alias su="su -c '/bin/bash -rcfile ${SANDBOX_BASHRC}'"
declare -r SANDBOX_ACTIVE
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/sandbox:master commit in: data/
@ 2021-05-04 8:50 Sergei Trofimovich
0 siblings, 0 replies; 7+ messages in thread
From: Sergei Trofimovich @ 2021-05-04 8:50 UTC (permalink / raw
To: gentoo-commits
commit: 6910d50097acba1549cde0b1e6d5d6f6169a6dc3
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue May 4 08:48:50 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue May 4 08:48:50 2021 +0000
URL: https://gitweb.gentoo.org/proj/sandbox.git/commit/?id=6910d500
sandbox.bashrc: use modern location of /lib/gentoo/functions.sh
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
data/sandbox.bashrc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/sandbox.bashrc b/data/sandbox.bashrc
index 60bef0e..e3421e6 100644
--- a/data/sandbox.bashrc
+++ b/data/sandbox.bashrc
@@ -28,8 +28,8 @@ if [[ ${SANDBOX_INTRACTV} == "1" && -t 1 ]] || [[ ${__SANDBOX_TESTING} == "yes"
(
[[ ${NOCOLOR} == "true" || ${NOCOLOR} == "yes" || ${NOCOLOR} == "1" ]] && \
export RC_NOCOLOR="yes"
- source /etc/init.d/functions.sh
- if [ $? -ne 0 ] ; then
+ source /lib/gentoo/functions.sh
+ if [[ $? -ne 0 ]] ; then
einfo() { echo " INFO: $*"; }
ewarn() { echo " WARN: $*"; }
eerror() { echo " ERR: $*"; }
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/sandbox:master commit in: data/
@ 2021-05-04 8:50 Sergei Trofimovich
0 siblings, 0 replies; 7+ messages in thread
From: Sergei Trofimovich @ 2021-05-04 8:50 UTC (permalink / raw
To: gentoo-commits
commit: 17706021b4acff1ce309e95e93eb135ecec6e1b5
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue May 4 08:47:20 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue May 4 08:47:20 2021 +0000
URL: https://gitweb.gentoo.org/proj/sandbox.git/commit/?id=17706021
sandbox.bashrc: handle rest of CCACHE users the same as root
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
data/sandbox.bashrc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/sandbox.bashrc b/data/sandbox.bashrc
index 252e0aa..60bef0e 100644
--- a/data/sandbox.bashrc
+++ b/data/sandbox.bashrc
@@ -102,7 +102,7 @@ if [[ ${SANDBOX_INTRACTV} == "1" && -t 1 ]] || [[ ${__SANDBOX_TESTING} == "yes"
sandboxon() { export SANDBOX_ON="1" ; }
sandboxoff() { export SANDBOX_ON="0" ; }
- [[ -z ${CCACHE_DIR} ]] && [[ -w /root/.ccache ]] && export CCACHE_DIR=/root/.ccache
+ [[ -z ${CCACHE_DIR} ]] && [[ -w $HOME/.ccache ]] && export CCACHE_DIR=$HOME/.ccache
for var in CCACHE_DIR DISTCC_DIR ; do
[[ ${!var+set} == "set" ]] && addwrite ${!var}
done
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/sandbox:master commit in: data/
@ 2021-11-05 10:25 Mike Frysinger
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger @ 2021-11-05 10:25 UTC (permalink / raw
To: gentoo-commits
commit: 1ebf7392b8c06a505f148de8cbe4ad303ed71275
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 5 09:46:10 2021 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Nov 5 09:46:10 2021 +0000
URL: https://gitweb.gentoo.org/proj/sandbox.git/commit/?id=1ebf7392
bashrc: setup T & HOME variables
Current versions of portage don't write these variables to the env
file, so manually set them up ourselves.
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
data/sandbox.bashrc | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/data/sandbox.bashrc b/data/sandbox.bashrc
index ec19459..3b953b8 100644
--- a/data/sandbox.bashrc
+++ b/data/sandbox.bashrc
@@ -79,7 +79,11 @@ if [[ ${SANDBOX_INTRACTV} == "1" && -t 1 ]] || [[ ${__SANDBOX_TESTING} == "yes"
-e '/^[[:alnum:]_-]* ()/Q' "${sbs_tmpenvfile}") 2>/dev/null
# Then grab everything (including functions)
source "${sbs_tmpenvfile}" 2> /dev/null
- export SANDBOX_WRITE=${SANDBOX_WRITE}:${sbs_pdir}${sbs_bdir}:${sbs_pdir}/homedir
+ # Some variables portage does not write out to th environment.
+ : "${T:=${sbs_tmpenvfile%/*}}"
+ HOME=${sbs_pdir}/homedir
+ SANDBOX_WRITE+=:${sbs_pdir}${sbs_bdir}:${HOME}
+ export T HOME SANDBOX_WRITE
fi
PWD=${sbs_PREPWD}
fi
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/sandbox:master commit in: data/
@ 2021-11-05 10:25 Mike Frysinger
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger @ 2021-11-05 10:25 UTC (permalink / raw
To: gentoo-commits
commit: f6205939906a1ce860a0cea4c57e9d6cf44e7786
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 5 09:06:17 2021 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Nov 5 09:06:17 2021 +0000
URL: https://gitweb.gentoo.org/proj/sandbox.git/commit/?id=f6205939
bashrc: clarify default prompt behavior
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
data/sandbox.bashrc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/sandbox.bashrc b/data/sandbox.bashrc
index e3421e6..ec19459 100644
--- a/data/sandbox.bashrc
+++ b/data/sandbox.bashrc
@@ -70,7 +70,7 @@ if [[ ${SANDBOX_INTRACTV} == "1" && -t 1 ]] || [[ ${__SANDBOX_TESTING} == "yes"
sbs_tmpenvfile=${sbs_pdir}${sbs_bdir}/temp/environment
if [[ -e ${sbs_tmpenvfile} ]] ; then
echo "Found environment at ${sbs_tmpenvfile}"
- printf " * Would you like to enter the portage environment ? "
+ printf " * Would you like to enter the portage environment (y/N) ? "
read env
sbs_PREPWD=${PWD}
if [[ ${env} == "y" ]] ; then
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-11-05 10:25 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-04 23:06 [gentoo-commits] proj/sandbox:master commit in: data/ Mike Frysinger
-- strict thread matches above, loose matches on Subject: below --
2012-11-17 19:16 Mike Frysinger
2021-05-04 8:50 Sergei Trofimovich
2021-05-04 8:50 Sergei Trofimovich
2021-05-04 8:50 Sergei Trofimovich
2021-11-05 10:25 Mike Frysinger
2021-11-05 10:25 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox