diff options
| author | Jonathan Schmidt-Dominé <[email protected]> | 2010-06-12 23:38:00 +0000 |
|---|---|---|
| committer | Jonathan Schmidt-Dominé <[email protected]> | 2010-06-12 23:38:00 +0000 |
| commit | ac206413f158c457dd1007cb9bf6167871a2a48f (patch) | |
| tree | 0986bbc86227aff5147b39e8f6d8527e7db123be /src/khns/servicemenuinstallation | |
| parent | c81b70d3a6d77210e3e18658b8ae3ef68b66ba88 (diff) | |
Fixed install/deinstall scripts
svn path=/trunk/KDE/kdebase/apps/; revision=1137451
Diffstat (limited to 'src/khns/servicemenuinstallation')
| -rwxr-xr-x | src/khns/servicemenuinstallation | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/khns/servicemenuinstallation b/src/khns/servicemenuinstallation index a580ce910..b99cc3b00 100755 --- a/src/khns/servicemenuinstallation +++ b/src/khns/servicemenuinstallation @@ -55,7 +55,7 @@ def uncompress(filename, output) end dir = archive + "-dir" if File.exist?(dir) - FileleUtils.rm_r(dir) + FileUtils.rm_r(dir) end FileUtils.mkdir(dir) exit(-1) if !uncompress(archive, dir) @@ -70,12 +70,13 @@ dd.read dd.read dir += "/" + dd.read dd = nil +Dir.chdir(dir) def fail() system("kdialog --passivepopup \"Installation failed\" 15") exit(-1) end -if !((File.exist?(file = dir + "/install-it.sh") || File.exist?(file = dir + "/install-it")) && system(file)) - fail() if !File.exist?(file = dir + "/installKDE4.sh") && !File.exist?(file = dir + "/installKDE4") && !File.exist?(file = dir + "/install.sh") && !File.exist?(file = dir + "/install") +if !((File.exist?(file = "./install-it.sh") || File.exist?(file = "./install-it")) && system(file)) + fail() if !File.exist?(file = "./installKDE4.sh") && !File.exist?(file = "./installKDE4") && !File.exist?(file = "./install.sh") && !File.exist?(file = "./install") File.new(file).chmod(0700) fail() if !system(file + " --local") && !system(file + "--local-install") && !system(file + " --install") end |