diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 07743ed..0dab942 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -73,7 +73,7 @@ jobs: - name: Login to DockerHub if: steps.have_credentials.outputs.access == 'true' - uses: docker/login-action@v1 + uses: docker/login-action@v1 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/Gemfile b/Gemfile index ff59bd7..7bbafbe 100644 --- a/Gemfile +++ b/Gemfile @@ -24,9 +24,9 @@ group :development do vagrant_gem_version = Gem::Version.new('2.2.8') end - vagrant_spec_verison = ENV['VAGRANT_SPEC_VERSION'] - if !vagrant_spec_verison.nil? && !vagrant_spec_verison.empty? - gem 'vagrant-spec', :git => 'https://github.com/hashicorp/vagrant-spec', :ref => vagrant_spec_verison + vagrant_spec_version = ENV['VAGRANT_SPEC_VERSION'] + if !vagrant_spec_version.nil? && !vagrant_spec_version.empty? + gem 'vagrant-spec', :git => 'https://github.com/hashicorp/vagrant-spec', :ref => vagrant_spec_version elsif vagrant_gem_version <= Gem::Version.new('2.2.7') gem 'vagrant-spec', :git => 'https://github.com/hashicorp/vagrant-spec', :ref => '161128f2216cee8edb7bcd30da18bd4dea86f98a' else diff --git a/docs/_assets/images/logo.png b/docs/_assets/images/logo.png index 6ad6eef..a35b0a5 100644 Binary files a/docs/_assets/images/logo.png and b/docs/_assets/images/logo.png differ diff --git a/docs/_includes/upstream-vagrant-install.html b/docs/_includes/upstream-vagrant-install.html index 9a9b324..88074b1 100644 --- a/docs/_includes/upstream-vagrant-install.html +++ b/docs/_includes/upstream-vagrant-install.html @@ -8,8 +8,8 @@ chmod a+x ./install.bash * Alternatively install vagrant following [https://www.vagrantup.com/downloads](https://www.vagrantup.com/downloads): {% if include.distro == "debian" or include.distro == "ubuntu" -%} ```shell -curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add - -sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main" +curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo tee /usr/share/keyrings/hashicorp-archive-keyring.asc +echo "deb [ signed-by=/usr/share/keyrings/hashicorp-archive-keyring.asc ] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list sudo apt-get update && sudo apt-get install vagrant ``` {% elsif include.distro == "fedora" -%} diff --git a/docs/configuration.markdown b/docs/configuration.markdown index 9034897..2065604 100644 --- a/docs/configuration.markdown +++ b/docs/configuration.markdown @@ -82,7 +82,7 @@ end `disk_bus` is set to `scsi` or `disk_device` starts with `sd`, which is a hint to use scsi. Defaults to `virtio-scsi` when it encounters either of the config values for `disk_bus` or `disk_device`. See [libvirt controller models]( - https://libvirt.org/formatdomain.html#controllers) for other posible values. + https://libvirt.org/formatdomain.html#controllers) for other possible values. NOTE: this option applies only to the disks associated with a box image. * `disk_device` - The disk device to emulate. Defaults to vda if not set, which should be fine for paravirtualized guests, but some fully @@ -418,7 +418,7 @@ starts with `libvirt__` string. Here is a list of those options: only when dhcp is enabled.By default is the same host that runs the DHCP server. * `:libvirt__tftp_root` - Path to the root directory served via TFTP. -* `:libvirt__adapter` - Number specifiyng sequence number of interface. +* `:libvirt__adapter` - Number specifying sequence number of interface. * `:libvirt__forward_mode` - Specify one of `veryisolated`, `none`, `open`, `nat` or `route` options. This option is used only when creating new network. Mode `none` will create isolated network without NATing or routing outside. You @@ -472,7 +472,7 @@ starts with `libvirt__` string. Here is a list of those options: * `:libvirt__driver_name` - Define which network driver to use. [More info](https://libvirt.org/formatdomain.html#elementsDriverBackendOptions) * `:libvirt__driver_queues` - Define a number of queues to be used for network - interface. Set equal to numer of vCPUs for best performance. [More + interface. Set equal to number of vCPUs for best performance. [More info](http://www.linux-kvm.org/page/Multiqueue) * `:autostart` - Automatic startup of network by the Libvirt daemon. If not specified the default is 'false'. @@ -549,7 +549,7 @@ the corresponding IP address. It is also possible to use the Qemu Agent to extract the management interface configuration from the booted virtual machine. This is helpful in libvirt -environments where no local dnsmasq is used for automatic address assigment, +environments where no local dnsmasq is used for automatic address assignment, but external dhcp services via bridged libvirt networks. Prerequisite is to enable the qemu agent channel via ([Libvirt communication @@ -582,7 +582,7 @@ to setup a bridged host network manually and define it via You can create and attach additional disks to a VM via `libvirt.storage :file`. It has a number of options: -* `path` - Location of the disk image. If unspecified, a path is automtically +* `path` - Location of the disk image. If unspecified, a path is automatically chosen in the same storage pool as the VMs primary disk. * `device` - Name of the device node the disk image will have in the VM, e.g. *vdb*. If unspecified, the next available device is chosen. @@ -705,7 +705,7 @@ Vagrant.configure("2") do |config| config.vm.provider :libvirt do |libvirt| libvirt.pci :domain => '0x0000', :bus => '0x06', :slot => '0x12', :function => '0x5' - # Add another one if it is neccessary + # Add another one if it is necessary libvirt.pci :domain => '0x0000', :bus => '0x03', :slot => '0x00', :function => '0x0' end end @@ -808,7 +808,7 @@ Note that in order to enable USB redirection with Spice clients, you may need to also set `libvirt.graphics_type = "spice"` #### Filter for USB Redirector Devices -You can define filter for redirected devices. These filters can be positiv or negative, by setting the mandatory option `allow=yes` or `allow=no`. All available options are listed below. Note the option `allow` is mandatory. +You can define filter for redirected devices. These filters can be positive or negative, by setting the mandatory option `allow=yes` or `allow=no`. All available options are listed below. Note the option `allow` is mandatory. * `class` - The device class of the USB device. A list of device classes is available on [Wikipedia](https://en.wikipedia.org/wiki/USB#Device_classes). * `vendor` - The vendor of the USB device. @@ -901,7 +901,7 @@ end ``` ## Smartcard device -A virtual smartcard device can be supplied to the guest via the `libvirt.smartcard` element. The option `mode` is mandatory and currently only value `passthrough` is supported. The value `spicevmc` for option `type` is default value and can be supressed. On using `type = tcp`, the options `source_mode`, `source_host` and `source_service` are mandatory. +A virtual smartcard device can be supplied to the guest via the `libvirt.smartcard` element. The option `mode` is mandatory and currently only value `passthrough` is supported. The value `spicevmc` for option `type` is default value and can be suppressed. On using `type = tcp`, the options `source_mode`, `source_host` and `source_service` are mandatory. ```ruby Vagrant.configure("2") do |config| diff --git a/docs/examples.markdown b/docs/examples.markdown index b4091d2..0e24368 100644 --- a/docs/examples.markdown +++ b/docs/examples.markdown @@ -95,7 +95,7 @@ that due to a well known limitation only the TCP protocol is supported. For each `forwarded_port` directive you specify in your Vagrantfile, vagrant-libvirt will maintain an active ssh process for the lifetime of the VM. If your VM should happen to be rebooted, the SSH session will need to be -restablished by halting the VM and bringing it back up. +re-established by halting the VM and bringing it back up. vagrant-libvirt supports an additional `forwarded_port` option `gateway_ports` which defaults to `false`, but can be set to `true` if you want the forwarded diff --git a/docs/installation.markdown b/docs/installation.markdown index 8454d8d..2575204 100644 --- a/docs/installation.markdown +++ b/docs/installation.markdown @@ -147,7 +147,7 @@ vagrant(){ } ``` -Running Podman in rootless mode maps the root user inside the container to your host user so we need to bypass [entrypoint.sh](https://github.com/vagrant-libvirt/vagrant-libvirt/blob/main/entrypoint.sh) and mount persistent storage directly to `/vagrant`. +Running Podman in rootless mode maps the root user inside the container to your host user so we need to bypass [entrypoint.sh](https://github.com/vagrant-libvirt/vagrant-libvirt/blob/main/entrypoint.sh) and mount persistent storage directly to `/vagrant`. #### Extending the container image with additional vagrant plugins @@ -396,7 +396,7 @@ git checkout imports/c8s/libssh-0.9.4-1.el8 into_srpm.sh -d c8s cd SRPMS -# common commands (make sure to adjust verison accordingly) +# common commands (make sure to adjust version accordingly) rpm2cpio libssh-0.9.4-1c8s.src.rpm | cpio -imdV tar xf libssh-0.9.4.tar.xz mkdir build @@ -428,7 +428,7 @@ get_sources.sh into_srpm.sh -d c8s cd SRPMS -# common commands (make sure to adjust verison accordingly) +# common commands (make sure to adjust version accordingly) rpm2cpio krb5-1.18.2-8c8s.src.rpm | cpio -imdV tar xf krb5-1.18.2.tar.gz cd krb5-1.18.2/src diff --git a/entrypoint.sh b/entrypoint.sh index d2b9f2b..a2a9b4b 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -119,7 +119,7 @@ done # make sure the directories can be written to by vagrant otherwise will # get a start up error -find ${VAGRANT_HOME} -maxdepth 1 ! -exec chown -h ${USER}:${GROUP} {} \+ +find "${VAGRANT_HOME}" -maxdepth 1 ! -exec chown -h ${USER}:${GROUP} {} \+ LIBVIRT_SOCK=/var/run/libvirt/libvirt-sock if [[ ! -S ${LIBVIRT_SOCK} ]] diff --git a/example_box/README.md b/example_box/README.md index 53464fc..5042917 100644 --- a/example_box/README.md +++ b/example_box/README.md @@ -23,7 +23,7 @@ Libvirt box should define at least three data fields in `metadata.json` file. ## Converting Boxes -Instead of creating a box from scratch, you can use -[vagrant-mutate](https://github.com/sciurus/vagrant-mutate) -to take boxes created for other Vagrant providers and use them +Instead of creating a box from scratch, you can use +[vagrant-mutate](https://github.com/sciurus/vagrant-mutate) +to take boxes created for other Vagrant providers and use them with vagrant-libvirt. diff --git a/example_box/Vagrantfile b/example_box/Vagrantfile index 33d6d1a..1c856ec 100644 --- a/example_box/Vagrantfile +++ b/example_box/Vagrantfile @@ -6,7 +6,7 @@ Vagrant.configure("2") do |config| # Example configuration of new VM.. - # + # #config.vm.define :test_vm do |test_vm| # Box name # @@ -22,7 +22,7 @@ Vagrant.configure("2") do |config| #end # Interfaces for VM - # + # # Networking features in the form of `config.vm.network` # #test_vm.vm.network :private_network, :ip => '10.20.30.40' @@ -59,4 +59,3 @@ Vagrant.configure("2") do |config| #libvirt.default_prefix = '' end end - diff --git a/example_box/metadata.json b/example_box/metadata.json index f483ad2..4abb696 100644 --- a/example_box/metadata.json +++ b/example_box/metadata.json @@ -1,5 +1,5 @@ { "provider" : "libvirt", "format" : "qcow2", - "virtual_size" : 16 + "virtual_size" : 16 } diff --git a/lib/vagrant-libvirt/action.rb b/lib/vagrant-libvirt/action.rb index 1501fc9..56bc2aa 100644 --- a/lib/vagrant-libvirt/action.rb +++ b/lib/vagrant-libvirt/action.rb @@ -162,7 +162,7 @@ module VagrantPlugins # Start it.. b3.use StartDomain - # Machine should gain IP address when comming up, + # Machine should gain IP address when coming up, # so wait for dhcp lease and store IP into machines data_dir. b3.use WaitTillUp require 'vagrant/action/builtin/wait_for_communicator' @@ -411,7 +411,7 @@ module VagrantPlugins end end end - + # This is the action that is primarily responsible for restoring a snapshot def self.action_snapshot_restore Vagrant::Action::Builder.new.tap do |b| @@ -420,7 +420,7 @@ module VagrantPlugins unless env[:result] raise Vagrant::Errors::VMNotCreatedError end - + b2.use SnapshotRestore end end @@ -434,7 +434,7 @@ module VagrantPlugins unless env[:result] raise Vagrant::Errors::VMNotCreatedError end - + b2.use SnapshotSave end end diff --git a/lib/vagrant-libvirt/action/create_domain.rb b/lib/vagrant-libvirt/action/create_domain.rb index a2250ff..a0158bd 100644 --- a/lib/vagrant-libvirt/action/create_domain.rb +++ b/lib/vagrant-libvirt/action/create_domain.rb @@ -246,7 +246,7 @@ module VagrantPlugins env[:ui].info(" -- Video Type: #{@video_type}") env[:ui].info(" -- Video VRAM: #{@video_vram}") env[:ui].info(" -- Video 3D accel: #{@video_accel3d}") - env[:ui].info(" -- Sound Type: #{@sound_type}") + env[:ui].info(" -- Sound Type: #{@sound_type}") env[:ui].info(" -- Keymap: #{@keymap}") env[:ui].info(" -- TPM Backend: #{@tpm_type}") if @tpm_type == 'emulator' diff --git a/lib/vagrant-libvirt/action/create_network_interfaces.rb b/lib/vagrant-libvirt/action/create_network_interfaces.rb index b7e7eaf..d353363 100644 --- a/lib/vagrant-libvirt/action/create_network_interfaces.rb +++ b/lib/vagrant-libvirt/action/create_network_interfaces.rb @@ -41,7 +41,7 @@ module VagrantPlugins # Vagrant gives you adapter 0 by default # Assign interfaces to slots. configured_networks(env, @logger).each do |options| - # dont need to create interface for this type + # don't need to create interface for this type next if options[:iface_type] == :forwarded_port # TODO: fill first ifaces with adapter option specified. diff --git a/lib/vagrant-libvirt/action/create_networks.rb b/lib/vagrant-libvirt/action/create_networks.rb index 1421d27..ee2b451 100644 --- a/lib/vagrant-libvirt/action/create_networks.rb +++ b/lib/vagrant-libvirt/action/create_networks.rb @@ -44,7 +44,7 @@ module VagrantPlugins end # only one vm at a time should try to set up networks - # otherwise they'll have inconsitent views of current state + # otherwise they'll have inconsistent views of current state # and conduct redundant operations that cause errors @@lock.synchronize do # Iterate over networks If some network is not @@ -124,7 +124,7 @@ module VagrantPlugins # Throw an error if dhcp setting for an existing network does not # match what was configured in the vagrantfile # since we always enable dhcp for the management network - # this ensures we wont start a vm vagrant cant reach + # this ensures we won't start a vm vagrant can't reach # Allow the situation where DHCP is not requested (:libvirt__dhcp_enabled == false) # but where it is enabled on the virtual network def verify_dhcp @@ -321,7 +321,7 @@ module VagrantPlugins @network_ipv6_address = @interface_network[:ipv6_address] @network_ipv6_prefix = @interface_network[:ipv6_prefix] - + @network_bridge_stp = @options[:bridge_stp].nil? || @options[:bridge_stp] ? 'on' : 'off' @network_bridge_delay = @options[:bridge_delay] ? @options[:bridge_delay] : 0 diff --git a/lib/vagrant-libvirt/action/destroy_networks.rb b/lib/vagrant-libvirt/action/destroy_networks.rb index 77b2cf6..613670f 100644 --- a/lib/vagrant-libvirt/action/destroy_networks.rb +++ b/lib/vagrant-libvirt/action/destroy_networks.rb @@ -50,7 +50,7 @@ module VagrantPlugins if e.libvirt_code == ProviderLibvirt::Util::ErrorCodes::VIR_ERR_NO_NETWORK @logger.info 'It is already undefined' next - # some other error occured, so raise it again + # some other error occurred, so raise it again else raise e end diff --git a/lib/vagrant-libvirt/action/start_domain.rb b/lib/vagrant-libvirt/action/start_domain.rb index dc89934..38cd405 100644 --- a/lib/vagrant-libvirt/action/start_domain.rb +++ b/lib/vagrant-libvirt/action/start_domain.rb @@ -64,7 +64,7 @@ module VagrantPlugins disk_target.parent.delete_element("#{disk_target.parent.xpath}/address") end - # Iterface type + # Interface type unless config.nic_model_type.nil? REXML::XPath.each(xml_descr, '/domain/devices/interface/model') do |iface_model| if iface_model.attributes['type'] != config.nic_model_type diff --git a/lib/vagrant-libvirt/config.rb b/lib/vagrant-libvirt/config.rb index f825901..6fa4c50 100644 --- a/lib/vagrant-libvirt/config.rb +++ b/lib/vagrant-libvirt/config.rb @@ -11,7 +11,7 @@ module VagrantPlugins module ProviderLibvirt class Config < Vagrant.plugin('2', :config) # manually specify URI - # will supercede most other options if provided + # will supersede most other options if provided attr_accessor :uri # A hypervisor name to access via Libvirt. @@ -1016,7 +1016,7 @@ module VagrantPlugins end if @qemu_use_agent == true - # if qemu agent is used to optain domain ip configuration, at least + # if qemu agent is used to obtain domain ip configuration, at least # one qemu channel has to be configured. As there are various options, # error out and leave configuration to the user unless machine.provider_config.channels.any? { |channel| channel[:target_name].start_with?("org.qemu.guest_agent") } @@ -1088,7 +1088,7 @@ module VagrantPlugins result.cdroms = c result.disk_driver_opts = disk_driver_opts.merge(other.disk_driver_opts) - + c = clock_timers.dup c += other.clock_timers result.clock_timers = c diff --git a/lib/vagrant-libvirt/driver.rb b/lib/vagrant-libvirt/driver.rb index b2af683..72f0e59 100644 --- a/lib/vagrant-libvirt/driver.rb +++ b/lib/vagrant-libvirt/driver.rb @@ -239,7 +239,7 @@ module VagrantPlugins interface['ip-addresses'].each do |ip| # returning ipv6 addresses might break windows guests because - # winrm cant handle connection, winrm fails with "invalid uri" + # winrm can't handle connection, winrm fails with "invalid uri" next unless ip['ip-address-type'] == 'ipv4' ip_address = ip['ip-address'] diff --git a/lib/vagrant-libvirt/errors.rb b/lib/vagrant-libvirt/errors.rb index caf2203..a67b007 100644 --- a/lib/vagrant-libvirt/errors.rb +++ b/lib/vagrant-libvirt/errors.rb @@ -201,7 +201,7 @@ module VagrantPlugins class SnapshotListError < VagrantLibvirtError error_key(:snapshot_list_error) end - + class SnapshotCreationError < VagrantLibvirtError error_key(:snapshot_creation_error) end diff --git a/lib/vagrant-libvirt/provider.rb b/lib/vagrant-libvirt/provider.rb index 5a0bfdb..eadb0d1 100644 --- a/lib/vagrant-libvirt/provider.rb +++ b/lib/vagrant-libvirt/provider.rb @@ -52,7 +52,7 @@ module VagrantPlugins # :username => "mitchellh", # :private_key_path => "/path/to/my/key" # } - # note that modifing @machine.id or accessing @machine.state is not + # note that modifying @machine.id or accessing @machine.state is not # thread safe, so be careful to avoid these here as this method may # be called from other threads of execution. return nil if state.id != :running diff --git a/lib/vagrant-libvirt/templates/domain.xml.erb b/lib/vagrant-libvirt/templates/domain.xml.erb index 3947b19..8def8e6 100644 --- a/lib/vagrant-libvirt/templates/domain.xml.erb +++ b/lib/vagrant-libvirt/templates/domain.xml.erb @@ -226,7 +226,7 @@ <% end -%> <%#End Video -%> @@ -256,13 +256,13 @@ <%- if usb[:vendor] -%> - + <%- end -%> <%- if usb[:product] -%> - + <%- end -%> <%- if usb[:bus] && usb[:device] -%> -
+
<%- end -%> diff --git a/lib/vagrant-libvirt/util/byte_number.rb b/lib/vagrant-libvirt/util/byte_number.rb index 0612ddc..5174230 100644 --- a/lib/vagrant-libvirt/util/byte_number.rb +++ b/lib/vagrant-libvirt/util/byte_number.rb @@ -68,4 +68,3 @@ class ByteNumber < Numeric (to_f/(1024 ** n)).ceil end end - \ No newline at end of file diff --git a/locales/en.yml b/locales/en.yml index c3d52ad..750ac51 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -16,7 +16,7 @@ en: Created volume larger than box defaults, will require manual resizing of filesystems to utilize. box_version_missing: |- - No verison detected for %{name}, using timestamp to watch for modifications. Consider + No version detected for %{name}, using timestamp to watch for modifications. Consider generating a local metadata for the box with a version to allow better handling. See https://www.vagrantup.com/docs/boxes/format#box-metadata for further details. uploading_volume: |- @@ -194,7 +194,7 @@ en: snapshot_creation_error: |- Cannot create snapshot(s): %{error_message}. snapshot_reversion_error: |- - Cannot revert snapshot(s): %{error_message}. + Cannot revert snapshot(s): %{error_message}. serial_cannot_create_path_error: |- Error creating path for serial port output log: %{path} diff --git a/spec/unit/action/handle_box_image_spec.rb b/spec/unit/action/handle_box_image_spec.rb index d427d46..d5115b0 100644 --- a/spec/unit/action/handle_box_image_spec.rb +++ b/spec/unit/action/handle_box_image_spec.rb @@ -104,7 +104,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::HandleBoxImage do it 'should use the box file timestamp' do expect(ui).to receive(:warn).with( - "No verison detected for test, using timestamp to watch for modifications. Consider\n" + + "No version detected for test, using timestamp to watch for modifications. Consider\n" + "generating a local metadata for the box with a version to allow better handling.\n" + 'See https://www.vagrantup.com/docs/boxes/format#box-metadata for further details.' ) @@ -134,7 +134,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::HandleBoxImage do end it 'should use the box file timestamp' do - expect(ui).to receive(:warn).with(/No verison detected for test/) + expect(ui).to receive(:warn).with(/No version detected for test/) expect(subject.call(env)).to be_nil expect(env[:box_volume_number]).to eq(1) diff --git a/spec/unit/action_spec.rb b/spec/unit/action_spec.rb index 0147f38..9f76449 100644 --- a/spec/unit/action_spec.rb +++ b/spec/unit/action_spec.rb @@ -170,7 +170,7 @@ describe VagrantPlugins::ProviderLibvirt::Action do end end end - + describe '#action_snapshot_delete' do context 'when not created' do before do @@ -229,7 +229,7 @@ describe VagrantPlugins::ProviderLibvirt::Action do end end end - + describe '#action_snapshot_save' do context 'when not created' do before do diff --git a/spec/unit/driver_spec.rb b/spec/unit/driver_spec.rb index 4bff163..a43db79 100644 --- a/spec/unit/driver_spec.rb +++ b/spec/unit/driver_spec.rb @@ -197,7 +197,7 @@ describe VagrantPlugins::ProviderLibvirt::Driver do allow(machine.provider_config).to receive(:qemu_use_session).and_return(true) end - it 'should retreive the address via the system dhcp-leases API' do + it 'should retrieve the address via the system dhcp-leases API' do expect(domain).to receive(:mac).and_return("52:54:00:8b:dc:5f") expect(subject).to receive(:system_connection).and_return(system_connection1) expect(system_connection1).to receive(:list_all_networks).and_return(networks) diff --git a/spec/unit/templates/domain_all_settings.xml b/spec/unit/templates/domain_all_settings.xml index cac4b50..03a77ee 100644 --- a/spec/unit/templates/domain_all_settings.xml +++ b/spec/unit/templates/domain_all_settings.xml @@ -99,7 +99,7 @@ @@ -123,9 +123,9 @@ - - -
+ + +
diff --git a/spec/unit/util/byte_number_spec.rb b/spec/unit/util/byte_number_spec.rb index fded968..d37f6c7 100644 --- a/spec/unit/util/byte_number_spec.rb +++ b/spec/unit/util/byte_number_spec.rb @@ -25,4 +25,4 @@ describe ByteNumber do expect( ByteNumber.new(5).pow(5).to_i).to eq(5**5) end end -end \ No newline at end of file +end diff --git a/tools/create_box.sh b/tools/create_box.sh index 6139065..9026612 100755 --- a/tools/create_box.sh +++ b/tools/create_box.sh @@ -67,7 +67,7 @@ mkdir -p "$TMP_DIR" [[ ! -r "$IMG" ]] && error "'$IMG': Permission denied" if [ -n "$3" ] && [ -r "$3" ]; then - VAGRANTFILE_ADD="$(cat $3)" + VAGRANTFILE_ADD="$(cat "$3")" fi # We move / copy (when the image has master) the image to the tempdir