vagrant-solaris10 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acaa4a259cb62bd1806944ccec51abd888d612d7
-  data.tar.gz: 79359dc8c309ecc7f613e408afff8c83c7e370be
+  metadata.gz: a6bb4a7981dd542e30b7121550d1e24f0f008216
+  data.tar.gz: 7dc353140a37270bb448800ee6b77f25031ea34b
 SHA512:
-  metadata.gz: f4d9059c3df7f71d858a74cc7349bf807a8872b6fb7b6aa36f7c234f4dee7048ed80d61c56007c040e357c78c401ab2d8d9df8f9af45ee99704b59ec52f69752
-  data.tar.gz: e185e6f52b392d73e8ca30ac63d37a4044eaf0ae44ffc9c442be3c39b67d5d8c29900d2ac72376e778b724317a28bf36dc4cde486d9a7283f13dfbd1df77795a
+  metadata.gz: a59512d0bb3150998bb9b50f1e5ca12f0ed62189736053bda7aad64af7805e98720799a9487fbd548297d474d99372a5135c2f6c7cf8c384d568bc25de761b38
+  data.tar.gz: c913e18ef822e8259e79524e77086512ad9b7aed820e0a74b15bcae5f85c3f662bc83e5dc9b2dd1888442245ebb095bd62b56ed36ef0316a6db9dcb75e5605f7

data/README.md

@@ -21,6 +21,12 @@ Install via Vagrant
 $ vagrant plugin install vagrant-solaris10
 ```
 
+To install from source code, first build via `rake` and then:
+
+```zsh
+$ vagrant plugin install pkg/vagrant-solaris10-x.x.x.gem
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/tnarik/vagrant-solaris10/fork )

data/lib/vagrant-solaris10/cap/change_host_name.rb

@@ -9,7 +9,7 @@ module Vagrant
 
           # Only do this if the hostname is not already set
           machine.communicate.tap do |comm|
-            if !comm.test("#{machine.config.solaris.suexec_cmd} hostname | grep '#{name}")
+            if !comm.test("hostname | grep '#{name}", sudo: true))
               ifconfig = nil
               # Get ifconfig output
               comm.execute("ifconfig -a") do |type, data|

data/lib/vagrant-solaris10/cap/mount_nfs_folder.rb

@@ -21,9 +21,16 @@ module Vagrant
             expanded_guest_path = machine.guest.capability(
               :shell_expand_guest_path, opts[:guestpath])
   
-            # Create the folder
-            machine.communicate.sudo("mkdir -p #{expanded_guest_path}")
+            # clear prior symlink
+            if machine.communicate.test("test -L \"#{expanded_guest_path}\"", sudo: true)
+              machine.communicate.sudo("rm -f \"#{expanded_guest_path}\"")
+            end
   
+            # Create the folder if doesn't exist
+            if !machine.communicate.test("test -d \"#{expanded_guest_path}\"", sudo: true)
+              machine.communicate.sudo("mkdir -p #{expanded_guest_path}")
+            end
+
             # Figure out any options
             mount_opts = ["vers=#{opts[:nfs_version]}"]
             if opts[:mount_options]

data/lib/vagrant-solaris10/cap/mount_vmware_shared_folder.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014 Tnarik Innael - adaptation to Solaris and repackaging
+# Copyright (c) 2014-2015 Tnarik Innael - adaptation to Solaris and repackaging
 # Copyright (c) 2013-2014 timsutton/kalmanh/lsimons - from plugins/guests/darwin/cap/mount_vmware_shared_folder.rb
 module Vagrant
   module Solaris10
@@ -6,7 +6,21 @@ module Vagrant
       class MountVmwareSharedFolder
 
         def self.mount_vmware_shared_folder(machine, name, guestpath, options)
+          owner = options[:owner]
+          group = options[:group]
           machine.communicate.tap do |comm|
+            if owner.is_a? Integer
+              mount_uid = owner
+            else
+              mount_uid = "$(/usr/xpg4/bin/id -u #{owner})"
+            end
+
+            if group.is_a? Integer
+              mount_gid = group
+            else
+              mount_gid = "$(/bin/getent group #{group}  | cut -d: -f3)"
+            end
+
             # clear prior symlink
             if comm.test("test -L \"#{guestpath}\"", sudo: true)
               comm.sudo("rm -f \"#{guestpath}\"")
@@ -17,8 +31,17 @@ module Vagrant
               comm.sudo("rm -Rf \"#{guestpath}\"")
             end
   
+            # create guest parent folder if doesn't exist
+            parent_guest_path = File.dirname(guestpath)
+            if !comm.test("test -d \"#{parent_guest_path}\"", sudo: true)
+              comm.sudo("mkdir -p \"#{parent_guest_path}\"")
+            end
+
             # finally make the symlink
             comm.sudo("ln -s \"/hgfs/#{name}\" \"#{guestpath}\"")
+
+            # Set permissions correctly on the link
+            comm.sudo("chown -h #{mount_uid}:#{mount_gid} \"#{guestpath}\"")
           end
         end
         

data/lib/vagrant-solaris10/cap/rsync.rb

@@ -4,8 +4,8 @@ module Vagrant
       class RSync
 
         def self.rsync_post(machine, opts)
-          machine.communicate.execute(
-            "#{machine.config.solaris.suexec_cmd} find '#{opts[:guestpath]}' '(' ! -user #{opts[:owner]} -o ! -group #{opts[:group]} ')' " +
+          machine.communicate.sudo(
+            "find '#{opts[:guestpath]}' '(' ! -user #{opts[:owner]} -o ! -group #{opts[:group]} ')' " +
             " -exec chown #{opts[:owner]}:#{opts[:group]} {} +")
         end
         

data/lib/vagrant-solaris10/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Solaris10
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-solaris10
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Tnarik Innael
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler