aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Wilmott <p@p8952.info>2015-03-22 21:44:06 +0000
committerPeter Wilmott <p@p8952.info>2015-03-22 21:44:06 +0000
commit955a30eadc1ae4423fef439f0c4197855a013179 (patch)
treee239e42413c8e4fe47e5030bd25c34dbad25c24c
parentBring build scripts and web interface inline with 7266717147d (diff)
downloadruby-tinderbox-955a30eadc1ae4423fef439f0c4197855a013179.tar.gz
ruby-tinderbox-955a30eadc1ae4423fef439f0c4197855a013179.tar.bz2
ruby-tinderbox-955a30eadc1ae4423fef439f0c4197855a013179.zip
Ensure package.* are files not directories; Sync portage after setting the correct mirrors
-rwxr-xr-xbin/provision.sh13
1 files changed, 10 insertions, 3 deletions
diff --git a/bin/provision.sh b/bin/provision.sh
index 7cc5510..cc4f726 100755
--- a/bin/provision.sh
+++ b/bin/provision.sh
@@ -2,16 +2,23 @@
set -o errexit -o nounset -o pipefail
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cp "$SCRIPT_DIR/make.conf" /etc/portage/make.conf
+if [[ -d /etc/portage/package.accept_keywords/ ]]; then
+ rm -r /etc/portage/package.accept_keywords/
+fi
+if [[ -d /etc/portage/package.use/ ]]; then
+ rm -r /etc/portage/package.use/
+fi
+
emerge-webrsync
emerge --metadata
-cp "$SCRIPT_DIR/make.conf" /etc/portage/make.conf
RUBIES="dev-lang/ruby:1.9 dev-lang/ruby:2.0 dev-lang/ruby:2.1 dev-lang/ruby:2.2"
set +e
emerge --pretend --quiet $RUBIES
if [[ $? == 1 ]]; then
- emerge --autounmask-write $RUBIES
- etc-update --automode -5
+ emerge --autounmask-write $RUBIES
+ etc-update --automode -5
fi
set -e
emerge --noreplace --quiet $RUBIES