oswitch 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbe3ef281a84b86f6912113be364ff1db6c2732d
-  data.tar.gz: 9abab4b1888052a8ad92c097dca8a238e743f7ea
+  metadata.gz: 6bde84f91e815e002f15c9427f385fcdaecc3dfd
+  data.tar.gz: 3feed23cc87a21c9c367086db2a5d699807b9c2f
 SHA512:
-  metadata.gz: 702620d1e4c891b48ad70d846ec8c744e8f370cde50820f83035e86120357566030cb091b1036eb4449ef9e35aa5f9c0e2306285c0240938736f4e854b919e20
-  data.tar.gz: f8a1ed6d3b66716f2bff1caad751f3f21421c76f7ecaafb8b26fc562077a045c7b0455103b9cb85c3298c474469bbe3b40718807f0accddc46932e79db8c562c
+  metadata.gz: cd0562b5a9c4aff52e3bd2d8103289978d40014dd431910ed8dfab28310972122f114006f93fbd44acc7e3634664e7c78f3fdc86c5386a9f76f4b58d8ee98cd8
+  data.tar.gz: 3f848cd7d793a626860a77347939b8812b72f42dfbf8f6bb0daaeb82764b904fe23bc9ab09b0b1618972d9292c1af59795440fc50a09795b4f40f8f216395614

data/lib/oswitch.rb

@@ -144,11 +144,15 @@ class OSwitch
     private :new
 
     def packages
-      Dir["#{DOTDIR}/*"].
-        select {|entry| File.directory? entry}.
-        map {|pkg|
-          pkg.gsub("#{DOTDIR}/", '')
-        }
+      Dir["#{DOTDIR}/*"].map do |rep|
+        pkgs = Dir["#{rep}/*"].select {|pkg| File.directory?(pkg)}
+        pkgs = [rep] if pkgs.empty?
+        pkgs
+      end.
+      flatten.
+      map {|pkg|
+        pkg.gsub("#{DOTDIR}/", '')
+      }
     end
   end
 
@@ -176,9 +180,9 @@ class OSwitch
       " -w #{cwd} #{mountargs} #{imgname} "
     if command.empty?
       # Display motd and run interactive shell.
-      cmdline << "#{shell} -c \"echo #{motd}; #{shell} -i\""
+      cmdline << "\"echo #{motd}; #{shell} -i\""
     else
-      cmdline << "#{shell} -c \"#{command}\""
+      cmdline << "\"#{command}\""
     end
     Kernel.exec cmdline
   end

data/oswitch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   # meta
   s.name        = 'oswitch'
-  s.version     = '0.2.1'
+  s.version     = '0.2.2'
   s.authors     = ['Anurag Priyam', 'Bruno Vieira', 'Yannick Wurm']
   s.email       = ['anurag08priyam@gmail.com']
   s.homepage    = 'https://github.com/yeban/oswitch'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oswitch
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Anurag Priyam