From 860011c4c529e1996ea2edebd1bed27b0ddb8e7b Mon Sep 17 00:00:00 2001
From: Jonathan Schmidt-Dominé <git@the-user.org>
Date: Wed, 2 Mar 2011 19:39:45 +0100
Subject: Better servicemenu(de)installation

---
 src/settings/services/servicemenudeinstallation | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'src/settings/services/servicemenudeinstallation')

diff --git a/src/settings/services/servicemenudeinstallation b/src/settings/services/servicemenudeinstallation
index a1c71efa7..24fd7bf10 100755
--- a/src/settings/services/servicemenudeinstallation
+++ b/src/settings/services/servicemenudeinstallation
@@ -12,11 +12,18 @@ dir = archive + "-dir"
 # try: installKDE4
 # try: install.sh
 # try: install
-dd = Dir.new(dir)
-dd.read
-dd.read
-dir += "/" + dd.read
-dd = nil
+while true
+    dd = Dir.new(dir)
+    break if dd.count != 3
+    odir = dir
+    for entry in dd
+        dir += "/" + entry if entry != "." && entry != ".."
+    end
+    if !File.directory? dir
+        dir = odir
+        break
+    end
+end
 Dir.chdir(dir)
 def fail()
     system("kdialog --passivepopup \"Deinstallation failed\" 15")
-- 
cgit v1.3.1