vagrant-export 0.2.5 → 0.2.6

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0237483397a46ff61612a77d4ad2f5138be1f455
4
- data.tar.gz: bc465a1457a13b3568769db932b12f6dc28d16ac
3
+ metadata.gz: ad8591a411d7650974b2b60cd9aa74c300216512
4
+ data.tar.gz: c49fe40935f20ccb07418c6ec9db912eb2cc02aa
5
5
  SHA512:
6
- metadata.gz: 8eed9c13da076b629aeda68cb960a30c111e3cf945691bff139c41bfde219bf3dabfe2e43fb625078b6e98e7bdf009cf739a07a80b15db2b199e022eefd00d73
7
- data.tar.gz: b7647f47b0db309264fff44ad8bccbd6435b716f00865871e26a73d0e328e51341d35740627c6568aafdbc114955e0617b92727c5e6e2b80f098814dec9fab4c
6
+ metadata.gz: d46c1d18737b87a1c5ad644ed482c81e9876cc2391f421bec5376e832dad5e9414e6cde57012945efe075a2eb3e4777df56ea8945ebf9a9698a860aa31460c8b
7
+ data.tar.gz: a0a2c43e7f4222c1c4a72af42993920cc8aa5f3cb4eb1f7b24494b88ada0c35b27206f17a59e7bd8019d1133f7a147375d56f5d140a86935f0287ac8e42294c6
@@ -13,7 +13,7 @@ module VagrantPlugins
13
13
 
14
14
  def execute
15
15
  options = {}
16
- options[:quick] = false
16
+ options[:fast] = false
17
17
  options[:bare] = false
18
18
 
19
19
  opts = OptionParser.new do |o|
@@ -147,7 +147,7 @@ module VagrantPlugins
147
147
  }
148
148
  end
149
149
 
150
- # Otherwise, just put copy it
150
+ # If it has one, just copy it
151
151
  if vagrantfile_has_mac
152
152
  FileUtils.cp(original_vagrantfile, File.join(@tmp_path, 'Vagrantfile'))
153
153
 
@@ -162,6 +162,8 @@ module VagrantPlugins
162
162
  }))
163
163
  end
164
164
 
165
+ # If there is a Vagrantfile, but without a mac
166
+ # ensure it is included
165
167
  if vagrantfile_exists
166
168
  FileUtils.mkdir_p(target_include_path) unless Dir.exist?(target_include_path)
167
169
  FileUtils.cp(original_vagrantfile, File.join(target_include_path, '_Vagrantfile'))
@@ -172,7 +174,7 @@ module VagrantPlugins
172
174
  @box_file_name = @tmp_path + '.box'
173
175
 
174
176
  Vagrant::Util::SafeChdir.safe_chdir(@tmp_path) do
175
- files = Dir.glob File.join('.', '**', '*')
177
+ files = Dir.glob(File.join('.', '**', '*'))
176
178
  Vagrant::Util::Subprocess.execute('bsdtar', '-czf', @box_file_name, *files)
177
179
  end
178
180
 
@@ -5,6 +5,6 @@
5
5
 
6
6
  module VagrantPlugins
7
7
  module Export
8
- VERSION = '0.2.5'
8
+ VERSION = '0.2.6'
9
9
  end
10
10
  end
data/res/cleanup.sh CHANGED
@@ -7,23 +7,22 @@ for DB in ${DBS}
7
7
  do
8
8
  echo 'SHOW TABLES;' | \
9
9
  mysql -u root $DB | \
10
- egrep '^cf_|^index_|^tx_realurl|sys_log|sys_history|dataflow_batch_export|dataflow_batch_import|log_customer|log_quote|log_summary|log_summary_type|log_url|log_url_info|log_visitor|log_visitor_info|log_visitor_online|report_viewed_product_index|report_compared_product_index|report_event|index_event|catalog_compare_item' | \
10
+ egrep '^cf_|^cache_|^cachingframework_|^index_|^tx_realurl|sys_log|sys_history|dataflow_batch_export|dataflow_batch_import|log_customer|log_quote|log_summary|log_summary_type|log_url|log_url_info|log_visitor|log_visitor_info|log_visitor_online|report_viewed_product_index|report_compared_product_index|report_event|index_event|catalog_compare_item' | \
11
11
  egrep -v 'index_stat|index_conf|realurl_redirect' | \
12
12
  awk '{print "TRUNCATE "$1";"}' | \
13
13
  mysql -u root $DB
14
-
15
14
  done
16
15
 
17
16
  echo "Reset vagrant authorized keys file"
18
- wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O '/home/vagrant/.ssh/authorized_keys'
17
+ wget -q --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O '/home/vagrant/.ssh/authorized_keys'
19
18
 
20
19
  echo "Removing old kernel packages"
21
- apt-get -y --purge remove $(dpkg --list | grep '^rc' | awk '{print $2}')
22
- apt-get -y --purge remove $(dpkg --list | egrep 'linux-(image|headers)-[0-9]' | awk '{print $3,$2}' | sort -nr | tail -n +2 | grep -v $(uname -r | sed -e s/-generic//g) | awk '{ print $2}')
20
+ apt-get -qq -y --purge remove $(dpkg --list | egrep '^rc' | awk '{print $2}')
21
+ apt-get -qq -y --purge remove $(dpkg --list | egrep 'linux-(image(-extra)?|headers)-[0-9]' | awk '{print $3,$2}' | grep -v $(uname -r | sed -e s/-generic//g) | awk '{ print $2}')
23
22
 
24
23
  echo "Cleaning up apt"
25
- apt-get -y --purge autoremove
26
- apt-get -y clean
24
+ apt-get -qq -y --purge autoremove
25
+ apt-get -qq -y clean
27
26
  rm -rf /var/lib/apt/lists/*
28
27
  rm -rf /var/lib/aptitude/*
29
28
 
@@ -34,18 +33,22 @@ rm -rf $HOME/.npm
34
33
  rm -rf $HOME/tmp
35
34
 
36
35
  if [[ -d /var/www/typo3temp ]]; then
37
- echo "Empty TYPO3 CMS temp files"
36
+ echo "Removing TYPO3 CMS temp files"
38
37
  find /var/www/typo3temp -type f -exec rm -f {} \;
39
- find /var/www/typo3temp -type d -iname "_processed_" -exec rm -rf {} \;
38
+ find /var/www/typo3temp -type d -iname "_processed_" -exec rm -rf {} \; > /dev/null 2>&1
39
+
40
+ if [[ -d /var/www/fileadmin/_processed_ ]]; then
41
+ rm -rf /var/www/fileadmin/_processed_/* > /dev/null 2>&1
42
+ fi
40
43
  fi
41
44
 
42
45
  if [[ -d /var/www/Data/Temporary ]]; then
43
- echo "Empty TYPO3 Flow temp files"
44
- rm -rf /var/www/Data/Temporary/*
46
+ echo "Removing TYPO3 Flow temp files"
47
+ rm -rf /var/www/Data/Temporary/* > /dev/null 2>&1
45
48
  fi
46
49
 
47
50
  if [[ -d /var/www/var/cache ]]; then
48
- echo "Empty Magento temp files"
51
+ echo "Removing Magento temp files"
49
52
  rm -rf /var/www/downloader/.cache/*
50
53
  rm -rf /var/www/downloader/pearlib/cache/*
51
54
  rm -rf /var/www/downloader/pearlib/download/*
@@ -58,7 +61,7 @@ if [[ -d /var/www/var/cache ]]; then
58
61
  fi
59
62
 
60
63
  echo "Zeroing device to make space..."
61
- dd if=/dev/zero of=/EMPTY bs=1M
64
+ dd if=/dev/zero of=/EMPTY bs=1M > /dev/null 2>&1
62
65
  rm -f /EMPTY
63
66
 
64
67
  echo "Sync to disc"
@@ -7,7 +7,7 @@ Gem::Specification.new do |g|
7
7
  g.version = VagrantPlugins::Export::VERSION
8
8
  g.platform = Gem::Platform::RUBY
9
9
  g.license = 'MIT'
10
- g.authors = 'Georg Grossberger'
10
+ g.authors = 'Georg Großberger'
11
11
  g.email = 'contact@grossberger-ge.org'
12
12
  g.homepage = 'https://github.com/trenker/vagrant-export'
13
13
  g.summary = 'Export boxes to .box files including the original Vagrantfile and some cleanups inside the VM'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-export
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.5
4
+ version: 0.2.6
5
5
  platform: ruby
6
6
  authors:
7
- - Georg Grossberger
7
+ - Georg Großberger
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-01-13 00:00:00.000000000 Z
11
+ date: 2015-01-21 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: Export boxes to .box files including the original Vagrantfile and some
14
14
  cleanups inside the VM
@@ -19,7 +19,6 @@ extra_rdoc_files: []
19
19
  files:
20
20
  - ".gitignore"
21
21
  - Gemfile
22
- - Gemfile.lock
23
22
  - README.md
24
23
  - lib/vagrant-export.rb
25
24
  - lib/vagrant-export/command.rb