code/superant.com.rwdtinkerbackwindow/installapplet.rb in rwdschedule-0.93 vs code/superant.com.rwdtinkerbackwindow/installapplet.rb in rwdschedule-0.94

@@ -1,21 +1,21 @@
-  def installapplet
-   require 'fileutils'
-    nametext = "%s" % [@a_installapplet]
-	 
-        begin # exception trapped block
-   	 fullname =  nametext + ".zip"
-     fileName = File.join($zipslocation,fullname)
-  	
-	        commandline = $unzipprogram + fileName
-         system( commandline+' > temp.output' )
-        
-    
-      
-    system(commandline)
-   @installapplettext = Message[:applet_installed]  
-   
-       rescue
-            @installapplettext = "Done! - Check applet list - restart rwd to activate the new applet"
-        end # exception rescue
-
-  end
+  def installapplet
+   require 'fileutils'
+   require 'extras/zip/zip'
+    nametext = "%s" % [@a_installapplet]
+	 
+        begin # exception trapped block
+   	 fullname =  nametext + ".zip"
+     fileName = File.join($zipslocation,fullname)
+
+  zf = Zip::ZipFile.new(fileName)
+ zf.sort.each {
+  |entry|
+      zf.extract(entry.to_s, entry.to_s)
+                     }
+   @installapplettext = Message[:applet_installed]  
+   
+       rescue
+            @installapplettext = "unzip error - applet may not be installed correctly"
+        end # exception rescue
+
+  end