Single-file-service-menus are now supported.

svn path=/trunk/KDE/kdebase/apps/; revision=1046238

2 files changed, 16 insertions, 2 deletions

diff --git a/src/khns/servicemenudeinstallation b/src/khns/servicemenudeinstallation
index eeadb4033..42c451e6c 100755
--- a/src/khns/servicemenudeinstallation
+++ b/src/khns/servicemenudeinstallation
@@ -1,6 +1,11 @@
 #!/usr/bin/env ruby
 require 'fileutils'
-topdir = ARGV[0] + "-dir"
+archive = ARGV[0]
+if archive[(archive.length - 8)..(archive.length)] == ".desktop"
+    FileUtils.rm(`kde4-config --localprefix`.strip! + "share/kde4/services/ServiceMenus/" + File.basename(archive))
+    exit(0)
+end
+topdir = archive + "-dir"
 # try: deinstall.sh
 # try: deinstall
 # try: installKDE4.sh
@@ -20,4 +25,4 @@ if !((File.exist?(file = dir + "/deinstall.sh") || File.exist?(file = dir + "/de
 File.new(file).chmod(0700)
     fail() if !system(file + " --remove") && !system(file + " --delete") && !system(file + " --uninstall") && !system(file + " --deinstall")
 end
-FileUtils.rm_r(topdir)
\ No newline at end of file
+FileUtils.rm_r(topdir)
diff --git a/src/khns/servicemenuinstallation b/src/khns/servicemenuinstallation
index fc04b8c56..a580ce910 100755
--- a/src/khns/servicemenuinstallation
+++ b/src/khns/servicemenuinstallation
@@ -2,6 +2,15 @@
 require 'pathname'
 require 'fileutils'
 archive = ARGV[0]
+$servicedir = `kde4-config --localprefix`.strip! + "share/kde4/services/ServiceMenus/"
+FileUtils.mkdir_p($servicedir) if !File.exist?($servicedir)
+if archive[(archive.length - 8)..(archive.length - 1)] == ".desktop"
+    puts "Single-File Service-Menu"
+    puts archive
+    puts $servicedir
+    FileUtils.cp(archive, $servicedir);
+    exit(0)
+end
 def mimeType(filename)
     IO.popen("file --mime-type -b " + filename).gets().strip!()
 end