aboutsummaryrefslogtreecommitdiff
path: root/bigtop_toolchain
diff options
context:
space:
mode:
authorOlaf Flebbe <of@oflebbe.de>2015-10-10 19:17:10 +0200
committerOlaf Flebbe <of@oflebbe.de>2015-10-13 22:17:42 +0200
commita8542618967dcba04b6871952e52306ad247971c (patch)
tree8dc9b4e3453d62d79c3bdee868e70d4d3a1e62e5 /bigtop_toolchain
parentf436309e1d3b7553433b75da46986a0cd4cdcf90 (diff)
downloadbigtop-odpi-a8542618967dcba04b6871952e52306ad247971c.tar.gz
BIGTOP-2079: './gradlew toolchain' removes irrelevant files on its cleanup
Diffstat (limited to 'bigtop_toolchain')
-rw-r--r--bigtop_toolchain/manifests/cleanup.pp4
-rw-r--r--bigtop_toolchain/manifests/vagrant.pp7
2 files changed, 6 insertions, 5 deletions
diff --git a/bigtop_toolchain/manifests/cleanup.pp b/bigtop_toolchain/manifests/cleanup.pp
index 0c742c56..94929e4d 100644
--- a/bigtop_toolchain/manifests/cleanup.pp
+++ b/bigtop_toolchain/manifests/cleanup.pp
@@ -21,8 +21,8 @@ class bigtop_toolchain::cleanup {
}
exec { 'remove archives':
- cwd => '/tmp',
- command => '/bin/bash -c "rm -rf /tmp/* ; rm -f /usr/src/* ; exit 0"'
+ cwd => '/usr/src',
+ command => '/bin/rm -f *.deb *.zip *.tar.gz'
}
exec { 'clean packages':
diff --git a/bigtop_toolchain/manifests/vagrant.pp b/bigtop_toolchain/manifests/vagrant.pp
index cf17fb64..07f9ae6a 100644
--- a/bigtop_toolchain/manifests/vagrant.pp
+++ b/bigtop_toolchain/manifests/vagrant.pp
@@ -18,12 +18,13 @@ class bigtop_toolchain::vagrant {
case $operatingsystem{
/Ubuntu|Debian/: {
exec {'download-vagrant':
- command => '/usr/bin/wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.1_x86_64.deb --output-document /tmp/vagrant_1.7.1_x86_64.deb',
- creates => '/tmp/vagrant_1.7.1_x86_64.deb'
+ command => '/usr/bin/wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.1_x86_64.deb',
+ cwd => '/usr/src',
+ creates => '/usr/src/vagrant_1.7.1_x86_64.deb'
}
package { 'vagrant':
ensure => 'latest',
- source => '/tmp/vagrant_1.7.1_x86_64.deb',
+ source => '/usr/src/vagrant_1.7.1_x86_64.deb',
provider => 'dpkg',
require => Exec['download-vagrant']
}