summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gmail.com>2010-09-26 21:56:38 +0200
committerDiego Elio Pettenò <flameeyes@gmail.com>2010-09-26 21:56:38 +0200
commit28693049ec6ec7a922919a4fea3e31915f59f5a6 (patch)
treed8b366a5086eda86a328917244947f0e57bef653
parentAllow providing an alternative list from the "complete", and keep it (diff)
downloadflameeyes-tinderbox-28693049ec6ec7a922919a4fea3e31915f59f5a6.tar.gz
flameeyes-tinderbox-28693049ec6ec7a922919a4fea3e31915f59f5a6.tar.bz2
flameeyes-tinderbox-28693049ec6ec7a922919a4fea3e31915f59f5a6.zip
Fix script when executed out of the tinderbox sources.
-rwxr-xr-xtinderbox-restart.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/tinderbox-restart.sh b/tinderbox-restart.sh
index 58d025f..6281246 100755
--- a/tinderbox-restart.sh
+++ b/tinderbox-restart.sh
@@ -15,6 +15,8 @@
# ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
# SOFTWARE.
+tboxdir=$(dirname $0)
+
mkdir -p /var/cache/tinderbox
reset_emergelog() {
@@ -35,7 +37,7 @@ emerge --sync
echo > /etc/portage/package.mask/currentrun
-./unavailable_installed.py | xargs -r emerge -C
+${tboxdir}/unavailable_installed.py | xargs -r emerge -C
reset_emergelog
@@ -43,7 +45,7 @@ emerge -u1 portage
emerge -u1 gcc
if fgrep -q '>>> emerge' /var/log/emerge.log && gcc-config -l | tail -n 1 | grep -v asneeded; then
- ./update-gcc-asneeded.sh
+ ${tboxdir}/update-gcc-asneeded.sh
exit 0
fi
@@ -100,7 +102,7 @@ reset_emergelog
# Generate a new complete list, this will also produce the list of new
# dependencies to satisfy. Ignore new-style virtuals, leave them to be
# merged out of dependencies.
-./tinderbox.py | egrep -v '^virtual/' > /var/cache/tinderbox/list-complete
+${tboxdir}/tinderbox.py | egrep -v '^virtual/' > /var/cache/tinderbox/list-complete
# Launch the fetch operation in background, saving the log (of both
# good results and failures).